cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Allows crew kin to use rigs (#11410)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-13 15:25:29 -07:00
committed by GitHub
parent b2b1dcd355
commit ed24a11b5f
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/datums/components/species/shadekin/shadekin.dm
View File

@@ -150,6 +150,13 @@
var/darkness = 1 var/darkness = 1
var/dark_gains = 0 var/dark_gains = 0
var/suit = owner.get_equipped_item(slot_wear_suit)
if(istype(suit, /obj/item/clothing/suit/space))
if(dark_energy)
to_chat(owner, span_warning("You feel your energy waning and your powers being blocked from the heavy equipment you're wearing!"))
dark_energy = 0
return
var/turf/T = get_turf(owner) var/turf/T = get_turf(owner)
if(!T) if(!T)
dark_gains = 0 dark_gains = 0

2
code/modules/asset_cache/asset_list.dm
View File

@@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(asset_datums)
SSasset_loading.dequeue_asset(src) SSasset_loading.dequeue_asset(src)
/datum/asset/spritesheet/queued_generation() /datum/asset/spritesheet/queued_generation()
realize_spritesheets(yield = TRUE) INVOKE_ASYNC(src, PROC_REF(realize_spritesheets), TRUE)
/datum/asset/spritesheet/ensure_ready() /datum/asset/spritesheet/ensure_ready()
if(!fully_generated) if(!fully_generated)

11
code/modules/clothing/spacesuits/rig/rig_pieces.dm
View File

@@ -12,9 +12,10 @@
SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi',
SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',
SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi' SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
SPECIES_SHADEKIN = 'icons/inventory/suit/mob_tajaran.dmi'
) )
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them 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
max_pressure_protection = null max_pressure_protection = null
min_pressure_protection = null min_pressure_protection = null
@@ -23,11 +24,11 @@
icon_state = "security_rig" icon_state = "security_rig"
flags = PHORONGUARD flags = PHORONGUARD
item_flags = THICKMATERIAL item_flags = THICKMATERIAL
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN)
/obj/item/clothing/shoes/magboots/rig /obj/item/clothing/shoes/magboots/rig
name = "boots" name = "boots"
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN)
icon_base = null icon_base = null
/obj/item/clothing/suit/space/rig /obj/item/clothing/suit/space/rig
@@ -50,7 +51,7 @@
SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi'
) )
supporting_limbs = list() supporting_limbs = list()
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them 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
var/obj/item/material/knife/tacknife var/obj/item/material/knife/tacknife
max_pressure_protection = null max_pressure_protection = null
min_pressure_protection = null min_pressure_protection = null

8
code/modules/clothing/spacesuits/void/ert_vr.dm
View File

@@ -180,7 +180,7 @@
SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
SPECIES_SHADEKIN_CREW = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', SPECIES_SHADEKIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
SPECIES_VASILISSAN = 'icons/inventory/suit/mob_vr.dmi', SPECIES_VASILISSAN = 'icons/inventory/suit/mob_vr.dmi',
SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr.dmi', SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr.dmi',
SPECIES_RAPALA = 'icons/inventory/suit/mob_vr.dmi', SPECIES_RAPALA = 'icons/inventory/suit/mob_vr.dmi',
@@ -197,7 +197,7 @@
SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr.dmi', SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr.dmi', SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr.dmi',
SPECIES_FENNEC = 'icons/inventory/suit/item_vr.dmi', SPECIES_FENNEC = 'icons/inventory/suit/item_vr.dmi',
SPECIES_SHADEKIN_CREW = 'icons/inventory/suit/item_vr.dmi', SPECIES_SHADEKIN = 'icons/inventory/suit/item_vr.dmi',
SPECIES_VASILISSAN = 'icons/inventory/suit/item_vr.dmi', SPECIES_VASILISSAN = 'icons/inventory/suit/item_vr.dmi',
SPECIES_NEVREAN = 'icons/inventory/suit/item_vr.dmi', SPECIES_NEVREAN = 'icons/inventory/suit/item_vr.dmi',
SPECIES_RAPALA = 'icons/inventory/suit/item_vr.dmi', SPECIES_RAPALA = 'icons/inventory/suit/item_vr.dmi',
@@ -219,7 +219,7 @@
SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi', SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi',
SPECIES_ZORREN_HIGH = '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_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi',
SPECIES_SHADEKIN_CREW = 'icons/inventory/head/mob_vr_vulpkanin.dmi', SPECIES_SHADEKIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi',
SPECIES_VASILISSAN = 'icons/inventory/head/mob_vr.dmi', SPECIES_VASILISSAN = 'icons/inventory/head/mob_vr.dmi',
SPECIES_NEVREAN = 'icons/inventory/head/mob_vr.dmi', SPECIES_NEVREAN = 'icons/inventory/head/mob_vr.dmi',
SPECIES_RAPALA = 'icons/inventory/head/mob_vr.dmi', SPECIES_RAPALA = 'icons/inventory/head/mob_vr.dmi',
@@ -236,7 +236,7 @@
SPECIES_VULPKANIN = 'icons/inventory/head/item_vr.dmi', SPECIES_VULPKANIN = 'icons/inventory/head/item_vr.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vr.dmi', SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vr.dmi',
SPECIES_FENNEC = 'icons/inventory/head/item_vr.dmi', SPECIES_FENNEC = 'icons/inventory/head/item_vr.dmi',
SPECIES_SHADEKIN_CREW = 'icons/inventory/head/item_vr.dmi', SPECIES_SHADEKIN = 'icons/inventory/head/item_vr.dmi',
SPECIES_VASILISSAN = 'icons/inventory/head/item_vr.dmi', SPECIES_VASILISSAN = 'icons/inventory/head/item_vr.dmi',
SPECIES_NEVREAN = 'icons/inventory/head/item_vr.dmi', SPECIES_NEVREAN = 'icons/inventory/head/item_vr.dmi',
SPECIES_RAPALA = 'icons/inventory/head/item_vr.dmi', SPECIES_RAPALA = 'icons/inventory/head/item_vr.dmi',