From fddbbce94e8fb51f2ade9d88cce4deb8e2c62365 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 13 Mar 2019 22:26:38 -0400 Subject: [PATCH 1/4] Update firstaid.dm Amends erroneous icon_states and adds functionality to medkits to pick one of the random striped/color patterns. Hope it doesn't break anything. --- code/game/objects/items/storage/firstaid.dm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c795726421..5470cb4dda 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -55,7 +55,7 @@ /obj/item/storage/firstaid/fire name = "burn treatment kit" desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down." - icon_state = "ointment" + icon_state = "burn" item_state = "firstaid-ointment" /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user) @@ -64,7 +64,7 @@ /obj/item/storage/firstaid/fire/Initialize(mapload) . = ..() - icon_state = pick("ointment","firefirstaid") + icon_state = pick("burn","burn2", "burn3", "burn4") /obj/item/storage/firstaid/fire/PopulateContents() if(empty) @@ -79,7 +79,7 @@ /obj/item/storage/firstaid/toxin name = "toxin treatment kit" desc = "Used to treat toxic blood content and radiation poisoning." - icon_state = "antitoxin" + icon_state = "toxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user) @@ -88,7 +88,7 @@ /obj/item/storage/firstaid/toxin/Initialize(mapload) . = ..() - icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") + icon_state = pick("toxin","toxin2","toxin3","toxin4") /obj/item/storage/firstaid/toxin/PopulateContents() if(empty) @@ -102,7 +102,7 @@ /obj/item/storage/firstaid/radbgone name = "radiation treatment kit" desc = "Used to treat minor toxic blood content and major radiation poisoning." - icon_state = "antitoxin" + icon_state = "toxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user) @@ -122,13 +122,17 @@ /obj/item/storage/firstaid/o2 name = "oxygen deprivation treatment kit" desc = "A box full of oxygen goodies." - icon_state = "o2" + icon_state = "oxy" item_state = "firstaid-o2" /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS +/obj/item/storage/firstaid/o2/Initialize(mapload) + . = ..() + icon_state = pick("oxy","oxy2","oxy3","oxy4") + /obj/item/storage/firstaid/o2/PopulateContents() if(empty) return @@ -148,6 +152,10 @@ user.visible_message("[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS +/obj/item/storage/firstaid/brute/Initialize(mapload) + . = ..() + icon_state = pick("brute","brute2","brute3","brute4") + /obj/item/storage/firstaid/brute/PopulateContents() if(empty) return From 1fea681ea44f482747f3efce7a154ccc4ce28d40 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 13 Mar 2019 23:54:44 -0400 Subject: [PATCH 2/4] Revert "Update firstaid.dm" This reverts commit fddbbce94e8fb51f2ade9d88cce4deb8e2c62365. --- code/game/objects/items/storage/firstaid.dm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 5470cb4dda..c795726421 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -55,7 +55,7 @@ /obj/item/storage/firstaid/fire name = "burn treatment kit" desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down." - icon_state = "burn" + icon_state = "ointment" item_state = "firstaid-ointment" /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user) @@ -64,7 +64,7 @@ /obj/item/storage/firstaid/fire/Initialize(mapload) . = ..() - icon_state = pick("burn","burn2", "burn3", "burn4") + icon_state = pick("ointment","firefirstaid") /obj/item/storage/firstaid/fire/PopulateContents() if(empty) @@ -79,7 +79,7 @@ /obj/item/storage/firstaid/toxin name = "toxin treatment kit" desc = "Used to treat toxic blood content and radiation poisoning." - icon_state = "toxin" + icon_state = "antitoxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user) @@ -88,7 +88,7 @@ /obj/item/storage/firstaid/toxin/Initialize(mapload) . = ..() - icon_state = pick("toxin","toxin2","toxin3","toxin4") + icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") /obj/item/storage/firstaid/toxin/PopulateContents() if(empty) @@ -102,7 +102,7 @@ /obj/item/storage/firstaid/radbgone name = "radiation treatment kit" desc = "Used to treat minor toxic blood content and major radiation poisoning." - icon_state = "toxin" + icon_state = "antitoxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user) @@ -122,17 +122,13 @@ /obj/item/storage/firstaid/o2 name = "oxygen deprivation treatment kit" desc = "A box full of oxygen goodies." - icon_state = "oxy" + icon_state = "o2" item_state = "firstaid-o2" /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS -/obj/item/storage/firstaid/o2/Initialize(mapload) - . = ..() - icon_state = pick("oxy","oxy2","oxy3","oxy4") - /obj/item/storage/firstaid/o2/PopulateContents() if(empty) return @@ -152,10 +148,6 @@ user.visible_message("[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS -/obj/item/storage/firstaid/brute/Initialize(mapload) - . = ..() - icon_state = pick("brute","brute2","brute3","brute4") - /obj/item/storage/firstaid/brute/PopulateContents() if(empty) return From 8cc589b069fde7ff145d8c0108cc96d004525df2 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 14 Mar 2019 00:03:37 -0400 Subject: [PATCH 3/4] Actually fixes the thing. Turns out this was 100% easier to fix than I thought. --- modular_citadel/code/game/objects/items/storage/firstaid.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/game/objects/items/storage/firstaid.dm b/modular_citadel/code/game/objects/items/storage/firstaid.dm index 82d7df4a00..ec4a721e05 100755 --- a/modular_citadel/code/game/objects/items/storage/firstaid.dm +++ b/modular_citadel/code/game/objects/items/storage/firstaid.dm @@ -23,7 +23,10 @@ /obj/item/storage/firstaid/o2 icon_state = "oxy" - + +/obj/item/storage/firstaid/radbgone + icon_state = "rad" + /obj/item/storage/firstaid/tactical icon_state = "tactical" From 890a23df52f223f3ee1bf0f2c0bfc405d8ea9812 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 14 Mar 2019 00:16:11 -0400 Subject: [PATCH 4/4] Github client is shit. Ooga --- modular_citadel/code/game/objects/items/storage/firstaid.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_citadel/code/game/objects/items/storage/firstaid.dm b/modular_citadel/code/game/objects/items/storage/firstaid.dm index ec4a721e05..6ddf3963dd 100755 --- a/modular_citadel/code/game/objects/items/storage/firstaid.dm +++ b/modular_citadel/code/game/objects/items/storage/firstaid.dm @@ -27,6 +27,10 @@ /obj/item/storage/firstaid/radbgone icon_state = "rad" +/obj/item/storage/firstaid/radbgone/Initialize(mapload) + . = ..() + icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4") + /obj/item/storage/firstaid/tactical icon_state = "tactical"