From e4bfa0e2f77568e2558c6b93e611c7f2c973a09d Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Fri, 7 Oct 2022 08:49:43 -0300 Subject: [PATCH] Fix #18872 Shark teeth is no longer invisible (#19229) * picks teeth icon instead of shards (large/medium/small) * Update code/modules/fish/fish_items.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * contrabang suggestions * suggestion * Apply suggestions from code review Co-authored-by: Farie82 * Update code/game/objects/items/weapons/shards.dm Co-authored-by: Farie82 * verb and state icons Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Farie82 --- code/game/objects/items/weapons/shards.dm | 9 ++++++--- code/modules/fish/fish_items.dm | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 9e949b8b2ce..e218ca3fba2 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -25,9 +25,7 @@ "[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide.")) return BRUTELOSS -/obj/item/shard/Initialize(mapload) - . = ..() - AddComponent(/datum/component/caltrop, force) +/obj/item/shard/proc/set_initial_icon_state() icon_state = pick("large", "medium", "small") switch(icon_state) if("small") @@ -42,6 +40,11 @@ if(icon_prefix) icon_state = "[icon_prefix][icon_state]" +/obj/item/shard/Initialize() + . = ..() + AddComponent(/datum/component/caltrop, force) + set_initial_icon_state() + /obj/item/shard/afterattack(atom/movable/AM, mob/user, proximity) if(!proximity || !(src in user)) return diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index a25065ddf8e..5189f67486f 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -157,10 +157,10 @@ throwforce = 5.0 materials = list() -/obj/item/shard/shark_teeth/Initialize(mapload) - . = ..() - src.pixel_x = rand(-5,5) - src.pixel_y = rand(-5,5) +/obj/item/shard/shark_teeth/set_initial_icon_state() + icon_state = "teeth" + pixel_x = rand(-5,5) + pixel_y = rand(-5,5) /obj/item/fish/catfish name = "catfish"