Merge master

This commit is contained in:
Waterpig
2024-08-08 19:59:08 +02:00
339 changed files with 4633 additions and 2168 deletions
@@ -37,6 +37,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
list(/datum/quirk/light_drinker, /datum/quirk/drunkhealing),
list(/datum/quirk/oversized, /datum/quirk/freerunning),
list(/datum/quirk/oversized, /datum/quirk/item_quirk/settler),
list(/datum/quirk/echolocation, /datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/nearsighted, /datum/quirk/item_quirk/deafness),
//SKYRAT EDIT ADDITION END
//BUBBER EDIT ADDITION BEGIN
list(/datum/quirk/featherweight, /datum/quirk/oversized),