From 0aac456adeb8b3ccc53229af4d205ca69d55e978 Mon Sep 17 00:00:00 2001 From: Krashly <104254674+Krashly@users.noreply.github.com> Date: Sun, 10 Sep 2023 01:08:18 +0300 Subject: [PATCH] fix (#317) * fix * hotfix * hothotfix --- .../krashly/code/game/objects/items/item.dm | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/modular_bluemoon/krashly/code/game/objects/items/item.dm b/modular_bluemoon/krashly/code/game/objects/items/item.dm index 349c92dab464..edeaf497fe96 100644 --- a/modular_bluemoon/krashly/code/game/objects/items/item.dm +++ b/modular_bluemoon/krashly/code/game/objects/items/item.dm @@ -34,18 +34,28 @@ icon_state = "full" item_flag = /obj/item/sign/flag/skull +/obj/item/sign/flag + var/flag_type = "" + /obj/item/sign/flag/skull name = "folded flag of the PMC Skull" desc = "The folded flag of the PMC Skull." + flag_type = "skull" icon = 'modular_bluemoon/krashly/icons/obj/skull_flag.dmi' icon_state = "mini" sign_path = /obj/structure/sign/flag/skull -/obj/structure/closet/crate/coffin/attackby(obj/item/sign/flag/skull/I) - icon = 'modular_bluemoon/krashly/icons/obj/skull_flag.dmi' - icon_state = "grob_full" - locked = TRUE - qdel(I) +/obj/structure/closet/crate/coffin/attacked_by(obj/item/sign/flag/I, mob/living/user) + if(I.flag_type == "skull") + icon = 'modular_bluemoon/krashly/icons/obj/skull_flag.dmi' + icon_state = "grob_full" + locked = TRUE + qdel(I) + if(I.flag_type == "inteq") + icon = 'modular_bluemoon/krashly/icons/obj/inteq_flag.dmi' + icon_state = "grob_full" + locked = TRUE + qdel(I) /datum/gear/donator/bm/skull_flag name = "PMC Skull flag" @@ -66,16 +76,11 @@ /obj/item/sign/flag/inteq name = "folded flag of the PMC InteQ" desc = "The folded flag of the PMC InteQ." + flag_type = "inteq" icon = 'modular_bluemoon/krashly/icons/obj/inteq_flag.dmi' icon_state = "mini" sign_path = /obj/structure/sign/flag/inteq -/obj/structure/closet/crate/coffin/attackby(obj/item/sign/flag/inteq/I) - icon = 'modular_bluemoon/krashly/icons/obj/inteq_flag.dmi' - icon_state = "grob_full" - locked = TRUE - qdel(I) - /obj/item/poster/random_inteq name = "random InteQ poster" poster_type = /obj/structure/sign/poster/contraband/inteq/random