Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Egg Changes #5054

Merged
merged 3 commits into from
Dec 9, 2023
Merged

Egg Changes #5054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc2a864
egg changes
Zonespace27 Nov 28, 2023
ecf4515
redo
Zonespace27 Nov 28, 2023
4193bea
Merge branch 'master' into egg-followup
Zonespace27 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions code/__DEFINES/layers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@

/// for xenos to hide behind bushes and tall grass
#define ABOVE_XENO_LAYER 4.12
/// For eggs so they can't hide below grass
#define EGG_LAYER 4.121
/// For facehuggers
#define FACEHUGGER_LAYER 4.13
/// For WEATHER
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_aliens/structures/egg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
icon_state = "Egg Growing"
density = FALSE
anchored = TRUE
layer = EGG_LAYER
layer = LYING_BETWEEN_MOB_LAYER
health = 80
plane = GAME_PLANE
var/list/egg_triggers = list()
Expand Down
6 changes: 6 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/egg_item.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@
to_chat(user, SPAN_XENOWARNING("[src] cannot be planted inside a vehicle."))
return

for(var/obj/object in T.contents)
var/obj/effect/alien/egg/xeno_egg = /obj/effect/alien/egg
if(object.layer > initial(xeno_egg.layer))
to_chat(user, SPAN_XENOWARNING("[src] cannot be planted below objects that would obscure it."))
fira marked this conversation as resolved.
Show resolved Hide resolved
return

user.visible_message(SPAN_XENONOTICE("[user] starts planting [src]."), SPAN_XENONOTICE("You start planting [src]."), null, 5)

var/plant_time = 35
Expand Down