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.
This commit is contained in:
@@ -55,7 +55,7 @@
|
|||||||
/obj/item/storage/firstaid/fire
|
/obj/item/storage/firstaid/fire
|
||||||
name = "burn treatment kit"
|
name = "burn treatment kit"
|
||||||
desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
|
desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
|
||||||
icon_state = "ointment"
|
icon_state = "burn"
|
||||||
item_state = "firstaid-ointment"
|
item_state = "firstaid-ointment"
|
||||||
|
|
||||||
/obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user)
|
/obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user)
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
/obj/item/storage/firstaid/fire/Initialize(mapload)
|
/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()
|
/obj/item/storage/firstaid/fire/PopulateContents()
|
||||||
if(empty)
|
if(empty)
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
/obj/item/storage/firstaid/toxin
|
/obj/item/storage/firstaid/toxin
|
||||||
name = "toxin treatment kit"
|
name = "toxin treatment kit"
|
||||||
desc = "Used to treat toxic blood content and radiation poisoning."
|
desc = "Used to treat toxic blood content and radiation poisoning."
|
||||||
icon_state = "antitoxin"
|
icon_state = "toxin"
|
||||||
item_state = "firstaid-toxin"
|
item_state = "firstaid-toxin"
|
||||||
|
|
||||||
/obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user)
|
/obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user)
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
|
|
||||||
/obj/item/storage/firstaid/toxin/Initialize(mapload)
|
/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()
|
/obj/item/storage/firstaid/toxin/PopulateContents()
|
||||||
if(empty)
|
if(empty)
|
||||||
@@ -102,7 +102,7 @@
|
|||||||
/obj/item/storage/firstaid/radbgone
|
/obj/item/storage/firstaid/radbgone
|
||||||
name = "radiation treatment kit"
|
name = "radiation treatment kit"
|
||||||
desc = "Used to treat minor toxic blood content and major radiation poisoning."
|
desc = "Used to treat minor toxic blood content and major radiation poisoning."
|
||||||
icon_state = "antitoxin"
|
icon_state = "toxin"
|
||||||
item_state = "firstaid-toxin"
|
item_state = "firstaid-toxin"
|
||||||
|
|
||||||
/obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
|
/obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
|
||||||
@@ -122,13 +122,17 @@
|
|||||||
/obj/item/storage/firstaid/o2
|
/obj/item/storage/firstaid/o2
|
||||||
name = "oxygen deprivation treatment kit"
|
name = "oxygen deprivation treatment kit"
|
||||||
desc = "A box full of oxygen goodies."
|
desc = "A box full of oxygen goodies."
|
||||||
icon_state = "o2"
|
icon_state = "oxy"
|
||||||
item_state = "firstaid-o2"
|
item_state = "firstaid-o2"
|
||||||
|
|
||||||
/obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user)
|
/obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user)
|
||||||
user.visible_message("<span class='suicide'>[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
user.visible_message("<span class='suicide'>[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||||
return OXYLOSS
|
return OXYLOSS
|
||||||
|
|
||||||
|
/obj/item/storage/firstaid/o2/Initialize(mapload)
|
||||||
|
. = ..()
|
||||||
|
icon_state = pick("oxy","oxy2","oxy3","oxy4")
|
||||||
|
|
||||||
/obj/item/storage/firstaid/o2/PopulateContents()
|
/obj/item/storage/firstaid/o2/PopulateContents()
|
||||||
if(empty)
|
if(empty)
|
||||||
return
|
return
|
||||||
@@ -148,6 +152,10 @@
|
|||||||
user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||||
return BRUTELOSS
|
return BRUTELOSS
|
||||||
|
|
||||||
|
/obj/item/storage/firstaid/brute/Initialize(mapload)
|
||||||
|
. = ..()
|
||||||
|
icon_state = pick("brute","brute2","brute3","brute4")
|
||||||
|
|
||||||
/obj/item/storage/firstaid/brute/PopulateContents()
|
/obj/item/storage/firstaid/brute/PopulateContents()
|
||||||
if(empty)
|
if(empty)
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user