From 5289776e337081b16777bf440d78904b3cc89d28 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:47:59 +0200 Subject: [PATCH 1/4] removes sharpness from forks too commonly available to enjoy the sharp bonus. --- code/game/objects/items/weapons/kitchen.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 7244d455203..12af48f6c84 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -66,7 +66,6 @@ name = "fork" desc = "It's a fork. Sure is pointy." icon_state = "fork" - sharp = 1 /obj/item/weapon/kitchen/utensil/pfork name = "plastic fork" @@ -456,4 +455,4 @@ for(var/i = 1, i <= rand(1,2), i++) if(I) step(I, pick(NORTH,SOUTH,EAST,WEST)) - sleep(rand(2,4)) + sleep(rand(2,4)) From 9827838917b3bdd7b90f86605f3392584a7e009c Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:58:01 +0200 Subject: [PATCH 2/4] shrapnel check for human get_visible_implants() --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f4edb30e240..dc23eecd03b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1166,7 +1166,7 @@ var/list/visible_implants = list() for(var/datum/organ/external/organ in src.organs) for(var/obj/item/weapon/O in organ.implants) - if(!istype(O,/obj/item/weapon/implant) && O.w_class > class) + if(!istype(O,/obj/item/weapon/implant) && (O.w_class > class) && !istype(O,/obj/item/weapon/shard/shrapnel)) visible_implants += O return(visible_implants) From 10ab66aa40b10fc94d45260f603806eccfdb361f Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:58:16 +0200 Subject: [PATCH 3/4] adjusts verb for w_class 1 yankability --- code/modules/mob/mob.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 37b69afdaa9..d12a6df2386 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -950,7 +950,7 @@ mob/proc/yank_out_object() if(S == U) self = 1 // Removing object from yourself. - valid_objects = get_visible_implants(1) + valid_objects = get_visible_implants(0) if(!valid_objects.len) if(self) src << "You have nothing stuck in your body that is large enough to remove." @@ -961,9 +961,9 @@ mob/proc/yank_out_object() var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects if(self) - src << "You attempt to get a good grip on the [selection] in your body." + src << "You attempt to get a good grip on [selection] in your body." else - U << "You attempt to get a good grip on the [selection] in [S]'s body." + U << "You attempt to get a good grip on [selection] in [S]'s body." if(!do_after(U, 80)) return From a3cc178ad69091beba599945aac5b6c5e9ed8ae4 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:58:20 +0200 Subject: [PATCH 4/4] adjusts examine for w_class 1 yankability --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 6ce436e12a0..026ef891a98 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -388,7 +388,7 @@ if(display_gloves) msg += "[src] has blood running from under [t_his] gloves!\n" - for(var/implant in get_visible_implants(1)) + for(var/implant in get_visible_implants(0)) msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n"