cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11870 from Heroman3003/corpsefix

Browse Source 
Fixes startup issues with corpse equipment
This commit is contained in:
Casey
2021-11-22 23:17:43 -05:00
committed by Chompstation Bot
parent e6f330182b
commit fa4010e930
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/awaymissions/corpse.dm
View File

@@ -49,8 +49,6 @@
//TODO: insert cause of death handling/wound simulation here //TODO: insert cause of death handling/wound simulation here
if(src.corpseuniform) if(src.corpseuniform)
M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform) M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform)
if(src.corpsesuit)
M.equip_voidsuit_to_slot_or_del_with_refit(new src.corpsesuit(M), slot_wear_suit, src.species)
if(src.corpseshoes) if(src.corpseshoes)
M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes) M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes)
if(src.corpsegloves) if(src.corpsegloves)
@@ -61,8 +59,6 @@
M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses)
if(src.corpsemask) if(src.corpsemask)
M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask) M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask)
if(src.corpsehelmet)
M.equip_voidhelm_to_slot_or_del_with_refit(new src.corpsehelmet(M), slot_head, src.species)
if(src.corpsebelt) if(src.corpsebelt)
M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt) M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt)
if(src.corpsepocket1) if(src.corpsepocket1)
@@ -90,6 +86,11 @@
W.assignment = corpseidjob W.assignment = corpseidjob
M.set_id_info(W) M.set_id_info(W)
M.equip_to_slot_or_del(W, slot_wear_id) M.equip_to_slot_or_del(W, slot_wear_id)
// Do suit last to avoid equipping issues
if(src.corpsehelmet)
M.equip_voidhelm_to_slot_or_del_with_refit(new src.corpsehelmet(M), slot_head, src.species)
if(src.corpsesuit)
M.equip_voidsuit_to_slot_or_del_with_refit(new src.corpsesuit(M), slot_wear_suit, src.species)