Merge remote-tracking branch 'origin/upsteam-12-15-25-revert-unique-reskins'

# Conflicts:
#	_maps/bubber/automapper/templates/centcom/interlink_adminoffice.dmm
#	_maps/map_files/BoxStation/BoxStation.dmm
#	_maps/map_files/generic/CentCom_skyrat_z2.dmm
#	_maps/map_files/moonstation/moonstation.dmm
#	code/modules/holiday/holidays.dm
This commit is contained in:
nevimer
2026-01-12 22:09:10 -05:00
1118 changed files with 119008 additions and 36907 deletions
@@ -350,7 +350,7 @@
dame.physique = FEMALE
dame.update_body()
if(prob(30))
back = /obj/item/nullrod/vibro/talking
back = /obj/item/nullrod/claymore/talking
else
back = /obj/item/shield/buckler
belt = /obj/item/nullrod/claymore
@@ -388,8 +388,8 @@
/datum/outfit/consumed_heremoth
name = "Legion-Consumed Tribal Mothman"
uniform = /obj/item/clothing/under/costume/loincloth
suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch
head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch
suit = /obj/item/clothing/suit/chaplainsuit/armor/heretic
head = /obj/item/clothing/head/helmet/chaplain/heretic
/datum/outfit/consumed_heremoth/pre_equip(mob/living/carbon/human/moth, visuals_only = FALSE)
if(!visuals_only)