cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #18872 Shark teeth is no longer invisible (#19229)

Browse Source 
* 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 <farie82@users.noreply.github.com>

* Update code/game/objects/items/weapons/shards.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* verb and state icons

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Henri215
2022-10-07 13:49:43 +02:00
committed by GitHub
co-authored by Sirryan2002 Farie82
parent 1c8ca76a6e
commit e4bfa0e2f7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/shards.dm
+6 -3
View File
@@ -25,9 +25,7 @@
"<span class='danger'>[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>"))
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