From 2a8d7526d458538d95ee92472cf2aecafbeb3c95 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Thu, 28 Aug 2025 00:57:47 -0400 Subject: [PATCH] moves these and adds kin to list (#18331) --- .../clothing/spacesuits/rig/rig_pieces.dm | 47 ++++++++++----- .../clothing/spacesuits/rig/rig_pieces_vr.dm | 57 ------------------- .../clothing/spacesuits/rig/suits/station.dm | 10 ++++ vorestation.dme | 1 - 4 files changed, 42 insertions(+), 73 deletions(-) delete mode 100644 code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 642db4343a..26bb19de1b 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -8,14 +8,22 @@ flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR light_range = 4 sprite_sheets = list( - SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', - SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', - SPECIES_SHADEKIN = 'icons/inventory/suit/mob_tajaran.dmi' + SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/mob_vr_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/head/mob_vr_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/head/mob_vr_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_PROMETHEAN = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_ALTEVIAN = 'icons/inventory/head/mob_vr_altevian.dmi' ) - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN) //vox, diona, and zaddat can't use hardsuits not designed for them + species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN) max_pressure_protection = null min_pressure_protection = null @@ -24,11 +32,10 @@ icon_state = "security_rig" flags = PHORONGUARD item_flags = THICKMATERIAL - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN) - + species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN) /obj/item/clothing/shoes/magboots/rig name = "boots" - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN) + species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN) icon_base = null /obj/item/clothing/suit/space/rig @@ -45,13 +52,23 @@ resilience = 0.2 can_breach = 1 sprite_sheets = list( - SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', - SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', - SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' + SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_PROMETHEAN = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', + SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_altevian.dmi' ) supporting_limbs = list() - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN) //vox, diona, and zaddat can't use hardsuits not designed for them + species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN) var/obj/item/material/knife/tacknife max_pressure_protection = null min_pressure_protection = null diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm deleted file mode 100644 index 36941c8f05..0000000000 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ /dev/null @@ -1,57 +0,0 @@ -/obj/item/clothing/head/helmet/space/rig - sprite_sheets = list( - SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_AKULA = 'icons/inventory/head/mob_vr_akula.dmi', - SPECIES_SERGAL = 'icons/inventory/head/mob_vr_sergal.dmi', - SPECIES_NEVREAN = 'icons/inventory/head/mob_vr_sergal.dmi', - SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi', - SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi', - SPECIES_PROMETHEAN = 'icons/inventory/head/mob_skrell.dmi', - SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', - SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', - SPECIES_ALTEVIAN = 'icons/inventory/head/mob_vr_altevian.dmi' - ) - -/obj/item/clothing/suit/space/rig - sprite_sheets = list( - SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', - SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', - SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', - SPECIES_NEVREAN = 'icons/inventory/suit/mob_sergal.dmi', - SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', - SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi', - SPECIES_PROMETHEAN = 'icons/inventory/suit/mob_skrell.dmi', - SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', - SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', - SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_altevian.dmi' - ) - -/obj/item/clothing/head/helmet/space/rig - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN) - -/obj/item/clothing/gloves/gauntlets/rig - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN) - -/obj/item/clothing/shoes/magboots/rig - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN) - -/obj/item/clothing/suit/space/rig - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN) - -/obj/item/clothing/shoes/magboots/rig/ce - name = "advanced boots" -/obj/item/clothing/shoes/magboots/rig/ce/set_slowdown() - if(magpulse) - slowdown = shoes ? max(SHOES_SLOWDOWN, shoes.slowdown) : SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. - else if(shoes) - slowdown = shoes.slowdown - else - slowdown = SHOES_SLOWDOWN diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index f88354d366..8fc27c2363 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -153,6 +153,16 @@ name = "insulated gauntlets" siemens_coefficient = 0 +/obj/item/clothing/shoes/magboots/rig/ce + name = "advanced boots" +/obj/item/clothing/shoes/magboots/rig/ce/set_slowdown() + if(magpulse) + slowdown = shoes ? max(SHOES_SLOWDOWN, shoes.slowdown) : SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. + else if(shoes) + slowdown = shoes.slowdown + else + slowdown = SHOES_SLOWDOWN + /obj/item/rig/ce/equipped req_access = list(access_ce) diff --git a/vorestation.dme b/vorestation.dme index e848a21307..5117c3703f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2388,7 +2388,6 @@ #include "code\modules\clothing\spacesuits\rig\rig.dm" #include "code\modules\clothing\spacesuits\rig\rig_attackby.dm" #include "code\modules\clothing\spacesuits\rig\rig_pieces.dm" -#include "code\modules\clothing\spacesuits\rig\rig_pieces_vr.dm" #include "code\modules\clothing\spacesuits\rig\rig_tgui.dm" #include "code\modules\clothing\spacesuits\rig\rig_verbs.dm" #include "code\modules\clothing\spacesuits\rig\rig_wiring.dm"