Merge branch 'master' into upstream-25-02a

This commit is contained in:
Waterpig
2025-02-27 13:39:30 +01:00
committed by GitHub
22 changed files with 554 additions and 9 deletions
@@ -46,6 +46,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
list(/datum/quirk/featherweight, /datum/quirk/oversized),
list(/datum/quirk/overweight, /datum/quirk/obese),
list(/datum/quirk/dominant_aura, /datum/quirk/well_trained),
list(/datum/quirk/equipping/entombed, /datum/quirk/equipping/seamless_clothes),
list(/datum/quirk/equipping/entombed, /datum/quirk/badback),
//BUBBER EDIT ADDITION END
))