diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 2f441b611d8..73697c45634 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -197,7 +197,7 @@ ZIPPO icon_state = "cigaroff" icon_on = "cigaron" icon_off = "cigaroff" - type_butt = /obj/item/weapon/cigarbutt + type_butt = /obj/item/weapon/cigbutt/cigarbutt throw_speed = 0.5 item_state = "cigaroff" smoketime = 1500 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 6d199b3c2b1..ab059010cd6 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -109,7 +109,7 @@ 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/reagent_containers/food/snacks/appendix/inflamed(get_turf(M)) M:appendix_op_stage = 5.0 return new /obj/item/weapon/reagent_containers/food/snacks/appendix(get_turf(M)) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 598b6e05735..e36a4c71b21 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -472,20 +472,17 @@ /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." + icon = 'icons/obj/surgery.dmi' icon_state = "appendix" New() ..() reagents.add_reagent("nutriment", 3) src.bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/appendixinflamed +/obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed name = "inflamed appendix" desc = "An appendix which appears to be inflamed." icon_state = "appendixinflamed" - New() - ..() - reagents.add_reagent("nutriment", 1) - src.bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/tofu name = "Tofu" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index d33095e6724..fb098ef890e 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 9c3c9294e23..65ab6c99349 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ