From 786b59cf18c365212fadbf862cff7039b1ca593b Mon Sep 17 00:00:00 2001 From: Miniature Date: Sat, 14 Apr 2012 12:45:08 +0930 Subject: [PATCH] Get the hell out of my snacks, appendix! --- code/defines/obj/weapon.dm | 10 ++++++++++ code/game/objects/items/weapons/surgery_tools.dm | 4 ++-- code/modules/food/food.dm | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 986e24622ea..73dd0acc6bc 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1818,3 +1818,13 @@ gender = PLURAL icon = 'wizard.dmi' icon_state = "ectoplasm" + +/obj/item/weapon/appendix + name = "appendix" + desc = "An appendix which looks perfectly healthy." + icon_state = "appendix" + +/obj/item/weapon/appendixinflamed + name = "inflamed appendix" + desc = "An appendix which appears to be inflamed." + icon_state = "appendixinflamed" diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index becabfb18d9..9d1b5d19953 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -376,10 +376,10 @@ CIRCULAR SAW user << "\red You remove [M]'s appendix with [src]!" for(var/datum/disease/D in M.viruses) if(istype(D, /datum/disease/appendicitis)) - new /obj/item/weapon/reagent_containers/food/snacks/appendixinflamed(get_turf(M)) + new /obj/item/weapon/appendixinflamed(get_turf(M)) M:appendix_op_stage = 5.0 return - new /obj/item/weapon/reagent_containers/food/snacks/appendix(get_turf(M)) + new /obj/item/weapon/appendix(get_turf(M)) M:appendix_op_stage = 5.0 return diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index c9f61dee5af..e4ace4ad73f 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -249,7 +249,7 @@ var/toxin_amount = reagents.get_reagent_amount("nutriment") * 3 reagents.add_reagent("toxin",toxin_amount) processing_objects.Remove(src) -*/ + /obj/item/weapon/reagent_containers/food/snacks/appendix //yes, this is the same as meat. I might do something different in future name = "appendix" desc = "An appendix which looks perfectly healthy." @@ -267,7 +267,7 @@ ..() reagents.add_reagent("nutriment", 1) src.bitesize = 1 - +*/ /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/human name = "-meat" var/subjectname = ""