From 3278339bbe902f09ae5081756aaf00852638de24 Mon Sep 17 00:00:00 2001 From: DZD Date: Sun, 18 Jan 2015 14:56:45 -0500 Subject: [PATCH 1/2] Fixes Crisis Cyborg Bug They were getting advanced bruise/burn kits upon choosing the module, but recharging gave them bruise kits and ointment instead. --- code/modules/mob/living/silicon/robot/robot_modules.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 51775415cac..5538620b138 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -111,8 +111,8 @@ /obj/item/weapon/robot_module/crisis name = "crisis robot module" stacktypes = list( - /obj/item/stack/medical/ointment = 5, - /obj/item/stack/medical/bruise_pack = 5, + /obj/item/stack/medical/advanced/ointment = 5, + /obj/item/stack/medical/advanced/bruise_pack = 5, /obj/item/stack/medical/splint = 5 ) From 6dbd475166ed83699805054ad7441b5b92107900 Mon Sep 17 00:00:00 2001 From: DZD Date: Sun, 18 Jan 2015 15:32:14 -0500 Subject: [PATCH 2/2] Fixes Changeling Bug Fixes the bug where changelings could extract DNA from races with NO_SCAN if they used the extract DNA sting. --- code/game/gamemodes/changeling/changeling_powers.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 79b182afd37..c6df778144d 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -930,6 +930,10 @@ var/list/datum/dna/hivemind_bank = list() var/mob/living/carbon/human/T = changeling_sting(40, /mob/proc/changeling_extract_dna_sting) if(!T) return 0 + if(T.species.flags & NO_SCAN) // Yeah, this needs the same protection, otherwise you can steal DNA from Slime People and then blood overdose when you turn into one. + src << "We do not know how to parse this creature's DNA!" + changeling.chem_charges += 40 + return 0 T.dna.real_name = T.real_name changeling.absorbed_dna |= T.dna