From 4f956365300c40d434eb976f3270ee5114403ec5 Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Thu, 17 Jan 2013 00:59:18 +0000 Subject: [PATCH] Slimes can no longer be buckled to things, they're too squishy (people were abusing the fact that slime AI can't unbuckle) Golems get head protection from their suit now and have their head slot clear so you can tell em apart with hats. Fixed a typo related to slime surgery that I assume has been around since metroids were added how did nobody notice this thanks Failcakes. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5563 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/surgery_tools.dm | 2 +- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 4 ++++ code/modules/mob/living/carbon/metroid/metroid.dm | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index cc08b275e60..255ff8999ad 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -495,7 +495,7 @@ if(istype(M, /mob/living/carbon/slime)) if(M.stat == 2) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M.name] is having its silky inndards cut apart with [src] by [user].", 1) + O.show_message("\red [M.name] is having its silky innards cut apart with [src] by [user].", 1) M << "\red [user] begins to cut apart your innards with [src]!" user << "\red You cut [M]'s silky innards apart with [src]!" M:brain_op_stage = 2.0 diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 41d111bac6a..5e6e273edad 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -67,6 +67,10 @@ if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) ) return + if (istype(M, /mob/living/carbon/slime)) + user << "The [M] is too squishy to buckle in." + return + unbuckle() if (M == usr) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 2e189204d8c..cb8820c61e4 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -922,7 +922,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 w_class = 4//bulky item gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD slowdown = 1.0 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE @@ -1030,7 +1030,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 G.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(G), slot_shoes) G.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/golem(G), slot_wear_mask) G.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(G), slot_gloves) - G.equip_to_slot_or_del(new /obj/item/clothing/head/space/golem(G), slot_head) + //G.equip_to_slot_or_del(new /obj/item/clothing/head/space/golem(G), slot_head) G.loc = src.loc G.key = ghost.key G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."