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

Removes playable facehuggers #6491

Closed
wants to merge 1 commit into from
Closed

Removes playable facehuggers #6491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions code/modules/cm_aliens/structures/egg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,27 +257,6 @@
/obj/effect/alien/egg/forsaken
hivenumber = XENO_HIVE_FORSAKEN

/obj/effect/alien/egg/attack_ghost(mob/dead/observer/user)
. = ..() //Do a view printout as needed just in case the observer doesn't want to join as a Hugger but wants info
if(is_mainship_level(src) && !SSticker.mode.is_in_endgame) // if we're not in hijack don't allow this
to_chat(user, SPAN_WARNING("The hive's influence doesn't reach that far!"))
return
if(status == EGG_GROWING)
to_chat(user, SPAN_WARNING("\The [src] is still growing, give it some time!"))
return
if(status != EGG_GROWN)
to_chat(user, SPAN_WARNING("\The [src] doesn't have any facehuggers to inhabit."))
return

if(!GLOB.hive_datum[hivenumber].can_spawn_as_hugger(user))
return
//Need to check again because time passed due to the confirmation window
if(status != EGG_GROWN)
to_chat(user, SPAN_WARNING("\The [src] doesn't have any facehuggers to inhabit."))
return
GLOB.hive_datum[hivenumber].spawn_as_hugger(user, src)
Burst(FALSE, FALSE, null, TRUE)

//The invisible traps around the egg to tell it there's a mob right next to it.
/obj/effect/egg_trigger
name = "egg trigger"
Expand Down
4 changes: 0 additions & 4 deletions code/modules/cm_aliens/structures/special/egg_morpher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@
return XENO_NONCOMBAT_ACTION
..()

/obj/effect/alien/resin/special/eggmorph/attack_ghost(mob/dead/observer/user)
. = ..() //Do a view printout as needed just in case the observer doesn't want to join as a Hugger but wants info
join_as_facehugger_from_this(user)

/obj/effect/alien/resin/special/eggmorph/proc/join_as_facehugger_from_this(mob/dead/observer/user)
if(stored_huggers <= huggers_reserved)
to_chat(user, SPAN_WARNING("\The [src] doesn't have any facehuggers to inhabit."))
Expand Down
15 changes: 0 additions & 15 deletions code/modules/mob/dead/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,21 +928,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(SSticker.mode.check_xeno_late_join(src))
SSticker.mode.attempt_to_join_as_xeno(src)

/mob/dead/verb/join_as_facehugger()
set category = "Ghost.Join"
set name = "Join as a Facehugger"
set desc = "Try joining as a Facehugger from a Carrier or Egg Morpher."

if (!client)
return

if(SSticker.current_state < GAME_STATE_PLAYING || !SSticker.mode)
to_chat(src, SPAN_WARNING("The game hasn't started yet!"))
return

if(SSticker.mode.check_xeno_late_join(src))
SSticker.mode.attempt_to_join_as_facehugger(src)

/mob/dead/verb/join_as_lesser_drone()
set category = "Ghost.Join"
set name = "Join as a Lesser Drone"
Expand Down
Loading