From 55358fb3c7604aeec89fcc4dc87e9ec5be1e7961 Mon Sep 17 00:00:00 2001 From: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:51:19 -0400 Subject: [PATCH] mflrube (#29555) --- .../RandomRuins/SpaceRuins/oldstation.dmm | 4 +- code/_globalvars/lists/dye_registry.dm | 36 ++++---- .../crates_lockers/closets/malfunction.dm | 2 +- .../mission_code/ruins/oldstation.dm | 12 +-- code/modules/clothing/spacesuits/void.dm | 92 +++++++++---------- 5 files changed, 73 insertions(+), 73 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index b46358e1f0a..7fceedd96b0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -399,7 +399,7 @@ /area/ruin/ancientstation/betanorth) "bp" = ( /obj/structure/rack, -/obj/item/clothing/suit/space/nasavoid/old, +/obj/item/clothing/suit/space/void/old, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; @@ -1391,7 +1391,7 @@ /obj/structure/rack, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/head/helmet/space/nasavoid/old, +/obj/item/clothing/head/helmet/space/void/old, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" diff --git a/code/_globalvars/lists/dye_registry.dm b/code/_globalvars/lists/dye_registry.dm index a14b554c22e..77d716f8059 100644 --- a/code/_globalvars/lists/dye_registry.dm +++ b/code/_globalvars/lists/dye_registry.dm @@ -198,26 +198,26 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_CMO = /obj/item/clothing/head/helmet/space/plasmaman/cmo, ), DYE_REGISTRY_VOID_SUIT = list( - DYE_RED = /obj/item/clothing/suit/space/nasavoid, - DYE_GREEN = /obj/item/clothing/suit/space/nasavoid/green, - DYE_BLUE = /obj/item/clothing/suit/space/nasavoid/ltblue, - DYE_PURPLE = /obj/item/clothing/suit/space/nasavoid/purple, - DYE_YELLOW = /obj/item/clothing/suit/space/nasavoid/yellow, - DYE_CAPTAIN = /obj/item/clothing/suit/space/nasavoid/captain, - DYE_SYNDICATE = /obj/item/clothing/suit/space/nasavoid/syndi, - DYE_HOP = /obj/item/clothing/suit/space/nasavoid/ntblue, - DYE_NTREP = /obj/item/clothing/suit/space/nasavoid/ntblue, + DYE_RED = /obj/item/clothing/suit/space/void, + DYE_GREEN = /obj/item/clothing/suit/space/void/green, + DYE_BLUE = /obj/item/clothing/suit/space/void/ltblue, + DYE_PURPLE = /obj/item/clothing/suit/space/void/purple, + DYE_YELLOW = /obj/item/clothing/suit/space/void/yellow, + DYE_CAPTAIN = /obj/item/clothing/suit/space/void/captain, + DYE_SYNDICATE = /obj/item/clothing/suit/space/void/syndi, + DYE_HOP = /obj/item/clothing/suit/space/void/ntblue, + DYE_NTREP = /obj/item/clothing/suit/space/void/ntblue, ), DYE_REGISTRY_VOID_HELMET = list( - DYE_RED = /obj/item/clothing/head/helmet/space/nasavoid, - DYE_GREEN = /obj/item/clothing/head/helmet/space/nasavoid/green, - DYE_BLUE = /obj/item/clothing/head/helmet/space/nasavoid/ltblue, - DYE_PURPLE = /obj/item/clothing/head/helmet/space/nasavoid/purple, - DYE_YELLOW = /obj/item/clothing/head/helmet/space/nasavoid/yellow, - DYE_CAPTAIN = /obj/item/clothing/head/helmet/space/nasavoid/captain, - DYE_SYNDICATE = /obj/item/clothing/head/helmet/space/nasavoid/syndi, - DYE_HOP = /obj/item/clothing/head/helmet/space/nasavoid/ntblue, - DYE_NTREP = /obj/item/clothing/head/helmet/space/nasavoid/ntblue, + DYE_RED = /obj/item/clothing/head/helmet/space/void, + DYE_GREEN = /obj/item/clothing/head/helmet/space/void/green, + DYE_BLUE = /obj/item/clothing/head/helmet/space/void/ltblue, + DYE_PURPLE = /obj/item/clothing/head/helmet/space/void/purple, + DYE_YELLOW = /obj/item/clothing/head/helmet/space/void/yellow, + DYE_CAPTAIN = /obj/item/clothing/head/helmet/space/void/captain, + DYE_SYNDICATE = /obj/item/clothing/head/helmet/space/void/syndi, + DYE_HOP = /obj/item/clothing/head/helmet/space/void/ntblue, + DYE_NTREP = /obj/item/clothing/head/helmet/space/void/ntblue, ), DYE_REGISTRY_SYNDICATE_SUIT = list( DYE_RED = /obj/item/clothing/suit/space/syndicate, diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index 61bcc02b98c..81085f70bef 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -6,7 +6,7 @@ /obj/structure/closet/malf_suits/populate_contents() new /obj/item/tank/jetpack/void(src) new /obj/item/clothing/mask/breath(src) - new /obj/effect/nasavoidsuitspawner(src) + new /obj/effect/voidsuitspawner(src) new /obj/item/crowbar(src) new /obj/item/stock_parts/cell(src) new /obj/item/multitool(src) diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 7e8bb571a7d..4a91cb759e8 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -63,17 +63,17 @@ new /obj/item/stack/medical/ointment(src) new /obj/item/stack/medical/ointment(src) -/obj/item/clothing/head/helmet/space/nasavoid/old - name = "Engineering Void Helmet" - desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done." +/obj/item/clothing/head/helmet/space/void/old + name = "Antique Engineering Void Helmet" + desc = "An old helmet meant for EVA engineering work. Any insignia it had has long since worn away. While old and dusty, it still gets the job done." icon_state = "void-red" item_state = "void" -/obj/item/clothing/suit/space/nasavoid/old - name = "Engineering Voidsuit" +/obj/item/clothing/suit/space/void/old + name = "Antique Engineering Void Suit" icon_state = "void-red" item_state = "void" - desc = "A CentCom engineering dark red space suit. Age has degraded the suit making it difficult to move around in." + desc = "An old softsuit meant for engineering work. Any insignia it had has long since worn away. Age has degraded the suit making it difficult to move around in." slowdown = 4 allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool) diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index 01d5db555cf..4e4d4c52a2c 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -1,8 +1,8 @@ //Voidsuits -/obj/item/clothing/head/helmet/space/nasavoid - name = "\improper NASA void helmet" - desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance." +/obj/item/clothing/head/helmet/space/void + name = "\improper Antique Void Helmet" + desc = "An old space helmet with a wide plexiglass visor. It lacks any modern HUD systems and provides negligible armor protection. The interior smells like mothballs." icon_state = "void-red" item_state = "void" flags_inv = HIDEMASK|HIDEEARS @@ -15,11 +15,11 @@ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') -/obj/item/clothing/suit/space/nasavoid - name = "NASA Void Suit" +/obj/item/clothing/suit/space/void + name = "\improper Antique Void Suit" icon_state = "void-red" item_state = "void" - desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance." + desc = "An antique space suit commonly used for extravehicular repairs many years ago. Painfully outdated, it provides next to nothing beyond protection from the vaccuum of space." dyeable = TRUE dyeing_key = DYE_REGISTRY_VOID_SUIT allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool) @@ -30,97 +30,97 @@ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') //Colors!!! -/obj/item/clothing/head/helmet/space/nasavoid/green +/obj/item/clothing/head/helmet/space/void/green icon_state = "void-green" -/obj/item/clothing/suit/space/nasavoid/green +/obj/item/clothing/suit/space/void/green icon_state = "void-green" -/obj/item/clothing/head/helmet/space/nasavoid/ntblue +/obj/item/clothing/head/helmet/space/void/ntblue icon_state = "void-ntblue" -/obj/item/clothing/suit/space/nasavoid/ntblue +/obj/item/clothing/suit/space/void/ntblue icon_state = "void-ntblue" -/obj/item/clothing/head/helmet/space/nasavoid/purple +/obj/item/clothing/head/helmet/space/void/purple icon_state = "void-purple" -/obj/item/clothing/suit/space/nasavoid/purple +/obj/item/clothing/suit/space/void/purple icon_state = "void-purple" -/obj/item/clothing/head/helmet/space/nasavoid/yellow +/obj/item/clothing/head/helmet/space/void/yellow icon_state = "void-yellow" -/obj/item/clothing/suit/space/nasavoid/yellow +/obj/item/clothing/suit/space/void/yellow icon_state = "void-yellow" -/obj/item/clothing/head/helmet/space/nasavoid/ltblue +/obj/item/clothing/head/helmet/space/void/ltblue icon_state = "void-light_blue" -/obj/item/clothing/suit/space/nasavoid/ltblue +/obj/item/clothing/suit/space/void/ltblue icon_state = "void-light_blue" //Captian's Suit, like the other captian's suit, but looks better, at the cost of armor -/obj/item/clothing/head/helmet/space/nasavoid/captain - name = "fancy retro void helmet" +/obj/item/clothing/head/helmet/space/void/captain + name = "\improper Antique Captain's Void Helmet" icon_state = "void-captian" - desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance. This one is fit for a captain." + desc = "An old space helmet with a plexiglass visor and golden rank insignia. It lacks any modern HUD systems and provides nothing in the way of armor protection. The interior smells like cheap air freshener." -/obj/item/clothing/suit/space/nasavoid/captain - name = "fancy NASA void suit" +/obj/item/clothing/suit/space/void/captain + name = "\improper Antique Captain's Void Suit" icon_state = "void-captian" - desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance. This one is fit for a captain." + desc = "An antique space suit used by command staff many years ago. Painfully outdated, it provides next to nothing beyond protection from the vaccuum of space." //Syndi's suit, on par with a blood red softsuit -/obj/item/clothing/head/helmet/space/nasavoid/syndi - name = "blood-red retro void helmet" +/obj/item/clothing/head/helmet/space/void/syndi + name = "blood-red antique void helmet" icon_state = "void-syndi" - desc = "A high tech, NASA Centcom branch designed space suit helmet. This one looks rather suspicious." + desc = "A hastily-modified void helmet reinforced with metal plates and kevlar scraps. It's covered in a strange coating that seems to repel acidic substances." flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285) -/obj/item/clothing/suit/space/nasavoid/syndi - name = "blood-red NASA void suit" +/obj/item/clothing/suit/space/void/syndi + name = "blood-red antique void suit" icon_state = "void-syndi" - desc = "A high tech, NASA Centcom branch designed space suit. This one looks rather suspicious." + desc = "A hastily-modified void suit reinforced with metal plates and kevlar scraps. It's covered in a strange coating that seems to repel acidic substances." w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals) armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285) //random spawner -/obj/effect/nasavoidsuitspawner - name = "\improper NASA void suit spawner" +/obj/effect/voidsuitspawner + name = "\improper Antique void suit spawner" icon = 'icons/obj/clothing/suits.dmi' icon_state = "void-red" - desc = "You shouldn't see this, a spawner for NASA Void Suits." + desc = "You shouldn't see this, it's a spawner for Antique Void Suits." var/suits = list("red", "green", "ntblue", "purple", "yellow", "ltblue") -/obj/effect/nasavoidsuitspawner/New() +/obj/effect/voidsuitspawner/New() . = ..() - var/obj/item/clothing/head/helmet/space/nasavoid/H - var/obj/item/clothing/suit/space/nasavoid/S + var/obj/item/clothing/head/helmet/space/void/H + var/obj/item/clothing/suit/space/void/S switch(pick(suits)) if("red") - H = new /obj/item/clothing/head/helmet/space/nasavoid - S = new /obj/item/clothing/suit/space/nasavoid + H = new /obj/item/clothing/head/helmet/space/void + S = new /obj/item/clothing/suit/space/void if("green") - H = new /obj/item/clothing/head/helmet/space/nasavoid/green - S = new /obj/item/clothing/suit/space/nasavoid/green + H = new /obj/item/clothing/head/helmet/space/void/green + S = new /obj/item/clothing/suit/space/void/green if("ntblue") - H = new /obj/item/clothing/head/helmet/space/nasavoid/ntblue - S = new /obj/item/clothing/suit/space/nasavoid/ntblue + H = new /obj/item/clothing/head/helmet/space/void/ntblue + S = new /obj/item/clothing/suit/space/void/ntblue if("purple") - H = new /obj/item/clothing/head/helmet/space/nasavoid/purple - S = new /obj/item/clothing/suit/space/nasavoid/purple + H = new /obj/item/clothing/head/helmet/space/void/purple + S = new /obj/item/clothing/suit/space/void/purple if("yellow") - H = new /obj/item/clothing/head/helmet/space/nasavoid/yellow - S = new /obj/item/clothing/suit/space/nasavoid/yellow + H = new /obj/item/clothing/head/helmet/space/void/yellow + S = new /obj/item/clothing/suit/space/void/yellow if("ltblue") - H = new /obj/item/clothing/head/helmet/space/nasavoid/ltblue - S = new /obj/item/clothing/suit/space/nasavoid/ltblue + H = new /obj/item/clothing/head/helmet/space/void/ltblue + S = new /obj/item/clothing/suit/space/void/ltblue var/turf/T = get_turf(src) if(H) H.forceMove(T)