cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 08:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

moves these and adds kin to list (#18331)

Browse Source
This commit is contained in:
Cameron Lennox
2025-08-28 00:57:47 -04:00
committed by GitHub
parent 903f173a80
commit 2a8d7526d4
4 changed files with 42 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/rig_pieces.dm
+32 -15
View File
@@ -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
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
-57
View File
@@ -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
code/modules/clothing/spacesuits/rig/suits/station.dm
+10
View File
@@ -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)