Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
379 changed files with 37535 additions and 33147 deletions
@@ -88,3 +88,21 @@
name = JOB_BITRUNNER
outfit = /datum/outfit/job/bitrunner
icon_state = "corpsecargotech"
/obj/effect/mob_spawn/corpse/human/cmo
name = JOB_CHIEF_MEDICAL_OFFICER
outfit = /datum/outfit/job/cmo
icon_state = "corpsedoctor"
/obj/effect/mob_spawn/corpse/human/ce
name = JOB_CHIEF_ENGINEER
outfit = /datum/outfit/job/ce
icon_state = "corpseengineer"
/obj/effect/mob_spawn/corpse/human/secoff
name = JOB_SECURITY_OFFICER
outfit = /datum/outfit/job/security
/obj/effect/mob_spawn/corpse/human/hos
name = JOB_HEAD_OF_SECURITY
outfit = /datum/outfit/job/hos
@@ -262,7 +262,7 @@
else
backpack_contents += backpack_loot
if(prob(30))
backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(list( 1 = 3, 2 = 2, 3 = 1)))
backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(alist( 1 = 3, 2 = 2, 3 = 1)))
if(prob(10))
l_pocket = pick_weight(list(
/obj/item/bikehorn/golden = 3,
+1
View File
@@ -345,6 +345,7 @@
spawned_human.Drain()
else //Because for some reason I can't track down, things are getting turned into husks even if husk = false. It's in some damage proc somewhere.
spawned_human.cure_husk()
spawned_human.job = name
/obj/effect/mob_spawn/corpse/human/equip(mob/living/carbon/human/spawned_human)
. = ..()