From 9f95965abf2138610bc1899794ad3874edf5e275 Mon Sep 17 00:00:00 2001 From: Cheridan Date: Fri, 26 Jun 2015 17:15:19 -0500 Subject: [PATCH 1/2] Suit Sensor Fixes -Chameleon jumpsuit sensors now start off -Fixes unreported(?) bug where prisoner jumpsuits would start randomized when they are supposed to be always-on. --- code/modules/clothing/clothing.dm | 22 ++++++++------------ code/modules/clothing/under/chameleon.dm | 2 ++ code/modules/clothing/under/miscellaneous.dm | 1 + 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c655ee34d45..39e41cf2ef6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -212,18 +212,20 @@ BLIND // can't see anything armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women var/has_sensor = 1//For the crew computer 2 = unable to change mode - var/sensor_mode = 0 + var/random_sensor = 1 + var/sensor_mode = 0 /* 1 = Report living/dead, 2 = Report detailed damages, 3 = Report location */ var/can_adjust = 1 var/adjusted = 0 var/suit_color = null - - /* - 1 = Report living/dead - 2 = Report detailed damages - 3 = Report location - */ var/obj/item/clothing/tie/hastie = null +/obj/item/clothing/under/New() + if(random_sensor) + sensor_mode = pick(0,1,2,3) + adjusted = 0 + suit_color = item_color + ..() + /obj/item/clothing/under/attackby(obj/item/I, mob/user, params) attachTie(I, user) ..() @@ -384,12 +386,6 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) var/mob/living/carbon/human/H = loc H.update_inv_w_uniform(0) -/obj/item/clothing/under/New() - sensor_mode = pick(0,1,2,3) - adjusted = 0 - suit_color = item_color - ..() - /obj/item/clothing/proc/weldingvisortoggle() //Malk: proc to toggle welding visors on helmets, masks, goggles, etc. if(can_use(usr)) if(up) diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 20acefb09d6..ad24b1a1e8d 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -7,6 +7,8 @@ desc = "It's a plain jumpsuit. It has a small dial on the wrist." action_button_name = "Change" origin_tech = "syndicate=3" + sensor_mode = 0 //Hey who's this guy on the Syndicate Shuttle?? + random_sensor = 0 var/list/clothing_choices = list() var/malfunctioning = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 42dae95f077..6a755065f8c 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -54,6 +54,7 @@ item_color = "prisoner" has_sensor = 2 sensor_mode = 3 + random_sensor = 0 /obj/item/clothing/under/rank/mailman name = "mailman's jumpsuit" From d493cc37b3ab59da99a918a701079ce57aabd820 Mon Sep 17 00:00:00 2001 From: Cheridan Date: Fri, 26 Jun 2015 17:43:17 -0500 Subject: [PATCH 2/2] also makes the code compile i'm so nice --- code/modules/mining/abandoned_crates.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 71fd4afaaff..1e38491439f 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -27,7 +27,7 @@ new /obj/item/weapon/reagent_containers/food/drinks/bottle/rum(src) new /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia(src) new /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src) - new /obj/item/weapon/lighter/zippo(src) + new /obj/item/weapon/lighter(src) if(6 to 10) new /obj/item/weapon/bedsheet(src) new /obj/item/weapon/kitchen/knife(src)