From cb94cf279b63e9badd8b82e3802885c2af19142c Mon Sep 17 00:00:00 2001 From: Will <7099514+Willburd@users.noreply.github.com> Date: Fri, 19 Sep 2025 18:27:53 -0400 Subject: [PATCH] ling and defines (#18537) --- .../changeling/powers/fabricate_clothing.dm | 1 + code/modules/clothing/clothing.dm | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/code/datums/components/antags/changeling/powers/fabricate_clothing.dm b/code/datums/components/antags/changeling/powers/fabricate_clothing.dm index 306870c1975..56180fcff29 100644 --- a/code/datums/components/antags/changeling/powers/fabricate_clothing.dm +++ b/code/datums/components/antags/changeling/powers/fabricate_clothing.dm @@ -30,6 +30,7 @@ ordinary cloth, allowing us to make ourselves appear to wear almost anything." origin_tech = list() //The base chameleon items have origin technology, which we will inherit if we don't null out this variable. canremove = FALSE //Since this is essentially flesh impersonating clothes, tearing someone's skin off as if it were clothing isn't possible. + has_sensor = FALSE // Reveals ling, and doesn't make sense anyway! /obj/item/clothing/under/chameleon/changeling/emp_act(severity) //As these are purely organic, EMP does nothing to them. return diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index ab18b683671..177748203fa 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1165,13 +1165,13 @@ var/mob/living/carbon/human/H = loc sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1) switch(sensorpref) - if(1) sensor_mode = 0 //Sensors off - if(2) sensor_mode = 1 //Sensors on binary - if(3) sensor_mode = 2 //Sensors display vitals - if(4) sensor_mode = 3 //Sensors display vitals and enables tracking - if(5) sensor_mode = pick(0,1,2,3) //Select a random setting + if(1) sensor_mode = SUIT_SENSOR_OFF //Sensors off + if(2) sensor_mode = SUIT_SENSOR_BINARY //Sensors on binary + if(3) sensor_mode = SUIT_SENSOR_VITAL //Sensors display vitals + if(4) sensor_mode = SUIT_SENSOR_TRACKING //Sensors display vitals and enables tracking + if(5) sensor_mode = pick(SUIT_SENSOR_OFF, SUIT_SENSOR_BINARY, SUIT_SENSOR_VITAL, SUIT_SENSOR_TRACKING) //Select a random setting else - sensor_mode = pick(0,1,2,3) + sensor_mode = pick(SUIT_SENSOR_OFF, SUIT_SENSOR_BINARY, SUIT_SENSOR_VITAL, SUIT_SENSOR_TRACKING) log_runtime("Invalid switch for suit sensors, defaulting to random. [sensorpref] chosen") /obj/item/clothing/under/proc/update_rolldown_status() @@ -1261,13 +1261,13 @@ if (src.loc == user) switch(sensor_mode) - if(0) + if(SUIT_SENSOR_OFF) user.visible_message("[user] adjusts their sensors.", "You disable your suit's remote sensing equipment.") - if(1) + if(SUIT_SENSOR_BINARY) user.visible_message("[user] adjusts their sensors.", "Your suit will now report whether you are live or dead.") - if(2) + if(SUIT_SENSOR_VITAL) user.visible_message("[user] adjusts their sensors.", "Your suit will now report your vital lifesigns.") - if(3) + if(SUIT_SENSOR_TRACKING) user.visible_message("[user] adjusts their sensors.", "Your suit will now report your vital lifesigns as well as your coordinate position.") else if (istype(src.loc, /mob))