From ed24a11b5f0bad31ff2e100c49bb9a075ecc4534 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:25:29 -0700 Subject: [PATCH] [MIRROR] Allows crew kin to use rigs (#11410) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/datums/components/species/shadekin/shadekin.dm | 7 +++++++ code/modules/asset_cache/asset_list.dm | 2 +- code/modules/clothing/spacesuits/rig/rig_pieces.dm | 11 ++++++----- code/modules/clothing/spacesuits/void/ert_vr.dm | 8 ++++---- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/code/datums/components/species/shadekin/shadekin.dm b/code/datums/components/species/shadekin/shadekin.dm index 7f07218ad1..186a367477 100644 --- a/code/datums/components/species/shadekin/shadekin.dm +++ b/code/datums/components/species/shadekin/shadekin.dm @@ -150,6 +150,13 @@ var/darkness = 1 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) if(!T) dark_gains = 0 diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 69976d0cc9..8324fac2c3 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(asset_datums) SSasset_loading.dequeue_asset(src) /datum/asset/spritesheet/queued_generation() - realize_spritesheets(yield = TRUE) + INVOKE_ASYNC(src, PROC_REF(realize_spritesheets), TRUE) /datum/asset/spritesheet/ensure_ready() if(!fully_generated) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index dbf82fff41..05811b3dfd 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -12,9 +12,10 @@ 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_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 min_pressure_protection = null @@ -23,11 +24,11 @@ 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_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, 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_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_SHADEKIN) icon_base = null /obj/item/clothing/suit/space/rig @@ -50,7 +51,7 @@ SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' ) 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 max_pressure_protection = null min_pressure_protection = null diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index c3a9431d8e..be9a01cf83 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -180,7 +180,7 @@ SPECIES_VULPKANIN = '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_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_NEVREAN = '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_ZORREN_HIGH = '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_NEVREAN = '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_ZORREN_HIGH = '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_NEVREAN = '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_ZORREN_HIGH = '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_NEVREAN = 'icons/inventory/head/item_vr.dmi', SPECIES_RAPALA = 'icons/inventory/head/item_vr.dmi',