From bedb720f73a09172c7f4bc7ebb2cc6408cc744b4 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:08:58 +0300 Subject: [PATCH] die --- code/modules/cm_aliens/structures/egg.dm | 21 ------------------- .../structures/special/egg_morpher.dm | 4 ---- code/modules/mob/dead/observer/observer.dm | 15 ------------- 3 files changed, 40 deletions(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 889359bb7eef..6abb8a9fa345 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -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" diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index e24ff8d167d8..567400a4503c 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -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.")) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 0ea2b3856da1..2db10f8ac0bb 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -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"