cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 00:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'skrat/master' into upstream-christmas

Browse Source 
# Conflicts:
#	README.md
#	code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
#	code/game/machinery/bank_machine.dm
#	code/modules/unit_tests/station_trait_tests.dm
#	html/changelogs/archive/2023-12.yml
#	modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
#	modular_skyrat/modules/contractor/code/datums/midround/event.dm
#	modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	tgui/packages/tgui/interfaces/Fabrication/SearchBar.tsx
#	tgui/packages/tgui/interfaces/Spellbook.tsx
This commit is contained in:
nevimer
2023-12-24 23:15:34 -05:00
parent c1f4790b7c 1a01d40a38
commit 0a432b7eed
1251 changed files with 10250 additions and 7347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob_spawn/corpses/mining_corpses.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/effect/mob_spawn/corpse/human/legioninfested/special(mob/living/carbon/human/spawned_human)
. = ..()
var/obj/item/organ/internal/legion_tumour/cancer = new()
cancer.Insert(spawned_human, special = TRUE, drop_if_replaced = FALSE)
cancer.Insert(spawned_human, special = TRUE, movement_flags = DELETE_IF_REPLACED)
/// Returns the outfit worn by our corpse
/obj/effect/mob_spawn/corpse/human/legioninfested/proc/select_outfit()