From a0cdce830b2425af250b9e49f5c8955a6a63ff39 Mon Sep 17 00:00:00 2001 From: Mike Long Date: Thu, 18 Aug 2016 16:08:55 -0400 Subject: [PATCH 1/2] Slimebrains are now properly an internal organ. --- code/modules/mob/living/carbon/brain/brain_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 26d25238197..621efe89ac1 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -115,7 +115,7 @@ mmi_icon_state = "slime_mmi" // parent_organ = "chest" Hello I am from the ministry of rubber forehead aliens how are you -/obj/item/organ/brain/slime/take_damage(var/amount, var/silent = 1) +/obj/item/organ/internal/brain/slime/take_damage(var/amount, var/silent = 1) //Slimes are 150% more vulnerable to brain damage damage = between(0, src.damage + (1.5*amount), max_damage) //Since they take the damage twice, this is +150% return ..() From 78c4f7a9aae05887a7d29332265f009dfb9ba3e2 Mon Sep 17 00:00:00 2001 From: Mike Long Date: Thu, 18 Aug 2016 17:37:04 -0400 Subject: [PATCH 2/2] Fixes away mission to utilize correct brain typepath --- _maps/map_files/RandomZLevels/spacehotel.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/RandomZLevels/spacehotel.dmm b/_maps/map_files/RandomZLevels/spacehotel.dmm index d3c520a6696..6a368e05b16 100644 --- a/_maps/map_files/RandomZLevels/spacehotel.dmm +++ b/_maps/map_files/RandomZLevels/spacehotel.dmm @@ -473,7 +473,7 @@ "je" = (/obj/machinery/gateway{dir = 4},/turf/unsimulated/floor{icon_state = "warning"; dir = 4},/area/awaymission/spacehotel) "jf" = (/obj/structure/window/basic{icon_state = "window"; dir = 8},/obj/structure/flora/rock,/obj/structure/flora/grass/brown,/turf/unsimulated/floor/grass,/area/awaymission/spacehotel) "jg" = (/obj/item/candle,/obj/effect/decal/cleanable/blood/old,/turf/unsimulated/floor{name = "engraved floor"; icon_state = "cult"},/area/awaymission/spacehotel) -"jh" = (/obj/effect/rune,/obj/item/organ/brain,/turf/unsimulated/floor{name = "engraved floor"; icon_state = "cult"},/area/awaymission/spacehotel) +"jh" = (/obj/effect/rune,/obj/item/organ/internal/brain,/turf/unsimulated/floor{name = "engraved floor"; icon_state = "cult"},/area/awaymission/spacehotel) "ji" = (/obj/item/candle,/turf/unsimulated/floor{name = "engraved floor"; icon_state = "cult"},/area/awaymission/spacehotel) "jj" = (/obj/item/weapon/tome,/turf/unsimulated/floor{name = "engraved floor"; icon_state = "cult"},/area/awaymission/spacehotel) "jk" = (/obj/structure/closet/crate/critter,/turf/unsimulated/floor{icon_state = "floor"},/area/awaymission/spacehotel)