From 0e8e6adcf1cee80cf397ce3806033dd2c43f5076 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 19 Jan 2017 17:47:06 -0200 Subject: [PATCH] Fix cloning (#1610) -fix clones spawning dead -fix #1603 -fix welding tools ignoring robotic limb damage cap --- code/game/machinery/cloning.dm | 2 +- code/game/objects/items/weapons/tools.dm | 3 +++ code/modules/clothing/gloves/miscellaneous.dm | 1 + html/changelogs/alberky-PR-1610.yml | 6 ++++++ icons/mob/hands.dmi | Bin 20469 -> 21075 bytes 5 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberky-PR-1610.yml diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index bb7dc3f85a4..24001431ead 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -112,7 +112,7 @@ //Get the clone body ready H.setCloneLoss(H.maxHealth * (100 - config.health_threshold_crit) / 100) // We want to put them exactly at the crit level, so we deal this much clone damage - H.adjustBrainLoss(80) // Even if healed to full health, it will have some brain damage + H.adjustBrainLoss(50) // Even if healed to full health, it will have some brain damage H.Paralyse(4) //Here let's calculate their health so the pod doesn't immediately eject them!!! diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 0730b668399..95768c20e7c 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -313,6 +313,9 @@ // Welder is switched off! user << "You need to light the welding tool, first!" return + if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP) + user << "The damage is far too severe to patch over externally." + return if (src.remove_fuel(0)) // Use a bit of fuel and repair S.heal_damage(15,0,0,1) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 0062339a6a0..c9292ab83a6 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -71,6 +71,7 @@ w_class = 1 wired = 1 species_restricted = null + gender = NEUTER verb/checktime() set category = "Object" diff --git a/html/changelogs/alberky-PR-1610.yml b/html/changelogs/alberky-PR-1610.yml new file mode 100644 index 00000000000..7f051e8d05e --- /dev/null +++ b/html/changelogs/alberky-PR-1610.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed clones spawning dead inside the cloning pod." diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 92881f713585ad959a010efdd6b5a9b8c9716f72..83e6d91d93369d37b934c20d180340d049fc9189 100644 GIT binary patch delta 2341 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 c*k7>}-m?Y2ySJw4l5%