Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-04a

This commit is contained in:
Waterpig
2025-04-08 18:58:45 +02:00
1089 changed files with 42417 additions and 34460 deletions
+6 -5
View File
@@ -94,6 +94,11 @@
wings.burnt = FALSE
burnt = FALSE
/obj/item/organ/wings/moth/feel_for_damage(self_aware)
if(burnt)
return "Your wings are all burnt up!"
return ..()
///Moth wing bodypart overlay, including burn functionality!
/datum/bodypart_overlay/mutant/wings/moth
feature_key = "wings" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "moth_wings"
@@ -108,16 +113,12 @@
return ..()
/datum/bodypart_overlay/mutant/wings/moth/get_global_feature_list()
return SSaccessories.sprite_accessories["wings"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.moth_wings_list
/datum/bodypart_overlay/mutant/wings/moth/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
var/mob/living/carbon/human/human = bodypart_owner.owner
if(!istype(human))
return TRUE
if(human.wear_suit?.flags_inv & HIDEMUTWINGS)
return ..(human, ignore_suit = TRUE)
return FALSE
return TRUE
/datum/bodypart_overlay/mutant/wings/moth/get_base_icon_state()