From 7f92ee281f09eeee6fa24ad20e6f99c7186b7686 Mon Sep 17 00:00:00 2001 From: nikothedude <59709059+nikothedude@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:21:29 -0500 Subject: [PATCH] [MODULAR] Removes op table numbing (#771) initial --- code/game/objects/structures/tables_racks.dm | 4 ---- .../code/game/objects/structures/tables_racks.dm | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5e39bbdd6d8..9131607c6c4 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -802,12 +802,8 @@ if(potential_patient.body_position == LYING_DOWN && potential_patient.loc == loc) patient = potential_patient - chill_out(patient) // NOVA EDIT - Operation Table Numbing return - if(!isnull(patient)) // NOVA EDIT - Operation Table Numbing - thaw_them(patient) // NOVA EDIT - Operation Table Numbing - // Find another lying mob as a replacement. for (var/mob/living/carbon/replacement_patient in loc.contents) if(replacement_patient.body_position == LYING_DOWN) diff --git a/modular_nova/master_files/code/game/objects/structures/tables_racks.dm b/modular_nova/master_files/code/game/objects/structures/tables_racks.dm index 1ee566b42f9..2058fbd5467 100644 --- a/modular_nova/master_files/code/game/objects/structures/tables_racks.dm +++ b/modular_nova/master_files/code/game/objects/structures/tables_racks.dm @@ -7,14 +7,3 @@ /obj/structure/table/reinforced/Initialize() . = ..() AddElement(/datum/element/liquids_height, 20) - -/// Used to numb a patient and apply stasis to them if enabled. -/obj/structure/table/optable/proc/chill_out(mob/living/target) - playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 2, frequency = rand(24750, 26550)) - ADD_TRAIT(target, TRAIT_NUMBED, REF(src)) - target.throw_alert("numbed", /atom/movable/screen/alert/numbed) - -///Used to remove the effects of stasis and numbing when a patient is unbuckled -/obj/structure/table/optable/proc/thaw_them(mob/living/target) - REMOVE_TRAIT(target, TRAIT_NUMBED, REF(src)) - target.clear_alert("numbed", /atom/movable/screen/alert/numbed)