diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index febf8e785c..4da1c73d2a 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -94,22 +94,22 @@ var/datum/effect/effect/system/spark_spread/spark_system /obj/item/weapon/rig/examine() - usr << "This is \icon[src][src.name]." - usr << "[src.desc]" + to_chat(usr, "This is \icon[src][src.name].") + to_chat(usr, "[src.desc]") if(wearer) for(var/obj/item/piece in list(helmet,gloves,chest,boots)) if(!piece || piece.loc != wearer) continue - usr << "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed." + to_chat(usr, "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") if(src.loc == usr) - usr << "The access panel is [locked? "locked" : "unlocked"]." - usr << "The maintenance panel is [open ? "open" : "closed"]." - usr << "Hardsuit systems are [offline ? "offline" : "online"]." - usr << "The cooling stystem is [cooling_on ? "active" : "inactive"]." + to_chat(usr, "The access panel is [locked? "locked" : "unlocked"].") + to_chat(usr, "The maintenance panel is [open ? "open" : "closed"].") + to_chat(usr, "Hardsuit systems are [offline ? "offline" : "online"].") + to_chat(usr, "The cooling stystem is [cooling_on ? "active" : "inactive"].") if(open) - usr << "It's equipped with [english_list(installed_modules)]." + to_chat(usr, "It's equipped with [english_list(installed_modules)].") /obj/item/weapon/rig/New() ..() @@ -211,12 +211,12 @@ // Seal = 0 unsets protection /obj/item/weapon/rig/proc/update_airtight(var/obj/item/piece, var/seal = 0) if(seal == 1) - min_pressure_protection = rigsuit_min_pressure - max_pressure_protection = rigsuit_max_pressure + piece.min_pressure_protection = rigsuit_min_pressure + piece.max_pressure_protection = rigsuit_max_pressure piece.item_flags |= AIRTIGHT else - min_pressure_protection = null - max_pressure_protection = null + piece.min_pressure_protection = null + piece.max_pressure_protection = null piece.item_flags &= ~AIRTIGHT return @@ -266,7 +266,8 @@ if(!instant) M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") if(seal_delay && !do_after(M,seal_delay)) - if(M) M << "You must remain still while the suit is adjusting the components." + if(M) + to_chat(M, "You must remain still while the suit is adjusting the components.") failed_to_seal = 1 if(!M) failed_to_seal = 1 @@ -282,7 +283,8 @@ continue if(!istype(M) || !istype(piece) || !istype(compare_piece) || !msg_type) - if(M) M << "You must remain still while the suit is adjusting the components." + if(M) + to_chat(M, "You must remain still while the suit is adjusting the components.") failed_to_seal = 1 break @@ -294,16 +296,16 @@ piece.icon_state = "[suit_state][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - M << "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"]." + to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") M.update_inv_shoes() if("gloves") - M << "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"]." + to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") M.update_inv_gloves() if("chest") - M << "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"]." + to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") M.update_inv_wear_suit() if("helmet") - M << "\The [piece] hisses [!seal_target ? "closed" : "open"]." + to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") M.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -338,7 +340,7 @@ // Success! canremove = seal_target - M << "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"]." + to_chat(M, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") M.client.screen -= booting_L qdel(booting_L) booting_R.icon_state = "boot_done" @@ -373,19 +375,21 @@ if(!cell) return if(cell.charge <= 0) - user << "\The [src] has no power!." + to_chat(user, "\The [src] has no power!.") return if(!suit_is_deployed()) - user << "The hardsuit needs to be deployed first!." + to_chat(user, "The hardsuit needs to be deployed first!.") return cooling_on = 1 - usr << "You switch \the [src]'s cooling system on." + to_chat(usr, "You switch \the [src]'s cooling system on.") /obj/item/weapon/rig/proc/turn_cooling_off(var/mob/user, var/failed) - if(failed) visible_message("\The [src]'s cooling system clicks and whines as it powers down.") - else usr << "You switch \the [src]'s cooling system off." + if(failed) + visible_message("\The [src]'s cooling system clicks and whines as it powers down.") + else + to_chat(usr, "You switch \the [src]'s cooling system off.") cooling_on = 0 /obj/item/weapon/rig/proc/get_environment_temperature() @@ -472,13 +476,13 @@ if(istype(wearer)) if(!canremove) if (offline_slowdown < 3) - wearer << "Your suit beeps stridently, and suddenly goes dead." + to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") else - wearer << "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit." + to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.") if(offline_vision_restriction == 1) - wearer << "The suit optics flicker and die, leaving you with restricted vision." + to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.") else if(offline_vision_restriction == 2) - wearer << "The suit optics drop out completely, drowning you in darkness." + to_chat(wearer, "The suit optics drop out completely, drowning you in darkness.") if(!offline) offline = 1 else @@ -531,7 +535,7 @@ fail_msg = "Not enough stored power." if(fail_msg) - user << "[fail_msg]" + to_chat(user, fail_msg) return 0 // This is largely for cancelling stealth and whatever. diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 7d9f2593f3..158d893788 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -18,6 +18,8 @@ SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' ) species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them + max_pressure_protection = null + min_pressure_protection = null /obj/item/clothing/gloves/gauntlets/rig name = "gauntlets" @@ -59,6 +61,8 @@ supporting_limbs = list() species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them var/obj/item/weapon/material/knife/tacknife + max_pressure_protection = null + min_pressure_protection = null /obj/item/clothing/suit/space/rig/attack_hand(var/mob/living/M) if(tacknife) diff --git a/html/changelogs/ater - rig pressurecooker.yml b/html/changelogs/ater - rig pressurecooker.yml new file mode 100644 index 0000000000..696de0487c --- /dev/null +++ b/html/changelogs/ater - rig pressurecooker.yml @@ -0,0 +1,4 @@ +author: Atermonera +delete-after: True +changes + - bugfix: "Rigsuits have been resupplied following a mass-recall after a number of suits were reported to have defective pressure-sealant mechanisms. The new sealant mechanisms have been thoroughly tested and should be less prone to failure." \ No newline at end of file