Bug fix for carrot shivs Fixes #22556 (#22627)

* carrot_progress

* more carrot testing

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* Bugfix for #22556

* Bug fix regarding carrot shivs (#22556)

* Update code/modules/hydroponics/grown/root.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* testing item.dmi fix

* hopeful items.dmi fix

* Update code/modules/hydroponics/grown/root.dm

Adds Contrabang's suggested parens.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
ZERO-XZB
2023-10-03 17:40:02 +01:00
committed by GitHub
co-authored by Nathan Winters Contrabang ZERO-XZB
parent b081cf9aad
commit 2b9ca38824
3 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -8388,7 +8388,7 @@
/obj/item/radio/intercom/syndicate{
pixel_x = -28
},
/obj/item/kitchen/knife/carrotshiv,
/obj/item/kitchen/knife/shiv/carrot,
/turf/simulated/floor/wood,
/area/wizard_station)
"GI" = (
+13 -13
View File
@@ -147,6 +147,19 @@
item_state = "glass_shiv"
icon_state = "glass_shiv"
/obj/item/kitchen/knife/shiv/carrot
name = "carrot shiv"
desc = "Unlike other carrots, you should probably keep this far away from your eyes."
icon = 'icons/obj/kitchen.dmi'
icon_state = "carrotshiv"
item_state = "carrotshiv"
force = 8
throwforce = 12 //fuck git
materials = list()
origin_tech = "biotech=3;combat=2"
attack_verb = list("shanked", "shivved")
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/kitchen/knife/butcher
name = "butcher's cleaver"
icon_state = "butch"
@@ -202,19 +215,6 @@
desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
origin_tech = null
/obj/item/kitchen/knife/carrotshiv
name = "carrot shiv"
icon_state = "carrotshiv"
item_state = "carrotshiv"
desc = "Unlike other carrots, you should probably keep this far away from your eyes."
force = 8
throwforce = 12 //fuck git
materials = list()
origin_tech = "biotech=3;combat=2"
attack_verb = list("shanked", "shivved")
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
/*
* Rolling Pins
*/
+1 -1
View File
@@ -34,7 +34,7 @@
/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(is_sharp(I))
to_chat(user, "<span class='notice'>You sharpen the carrot into a shiv with [I].</span>")
var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv
var/obj/item/kitchen/knife/shiv/carrot/Shiv = new ()
if(!remove_item_from_storage(user))
user.unEquip(src)
user.put_in_hands(Shiv)