From e60aad3f64b29433651b0e8b3b70a408619ad98c Mon Sep 17 00:00:00 2001 From: datlo Date: Sat, 29 Dec 2018 06:30:12 +0000 Subject: [PATCH] Rejuvenate mobs after nuke op equip Fix plasmamen burning up while the round setup Also handles if a plasmaman isn't changed to human and replaces annoying big tank with voxxygen for vox --- code/game/gamemodes/nuclear/nuclear.dm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 9690a81fb68..ef169b1f0cf 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -264,10 +264,21 @@ proc/issyndicate(mob/living/M as mob) switch(race) if("Vox" || "Vox Armalis") synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask) - synd_mob.equip_to_slot_or_del(new /obj/item/tank/nitrogen(synd_mob), slot_l_hand) + synd_mob.equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/vox(synd_mob), slot_l_hand) synd_mob.internal = synd_mob.l_hand synd_mob.update_action_buttons_icon() + if("Plasmaman") + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask) + synd_mob.equip_to_slot(new /obj/item/clothing/suit/space/eva/plasmaman/nuclear(synd_mob), slot_wear_suit) + synd_mob.equip_to_slot(new /obj/item/clothing/head/helmet/space/eva/plasmaman/nuclear(synd_mob), slot_head) + synd_mob.equip_or_collect(new /obj/item/tank/plasma/plasmaman(synd_mob), slot_s_store) + synd_mob.equip_or_collect(new /obj/item/plasmensuit_cartridge(synd_mob), slot_in_backpack) + synd_mob.equip_or_collect(new /obj/item/plasmensuit_cartridge(synd_mob), slot_in_backpack) + synd_mob.internal = synd_mob.get_item_by_slot(slot_s_store) + synd_mob.update_action_buttons_icon() + + synd_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(synd_mob) E.implant(synd_mob) synd_mob.faction |= "syndicate"