From 9b8ed8ca4fe79a287926d7792c908657e822e825 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 29 Nov 2019 07:14:51 +0100 Subject: [PATCH 1/2] The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs. --- code/game/objects/items/storage/firstaid.dm | 169 +++++++++++++++-- icons/obj/storage.dmi | Bin 69489 -> 71380 bytes .../game/objects/items/storage/firstaid.dm | 175 ------------------ modular_citadel/icons/firstaid.dmi | Bin 3073 -> 0 bytes tgstation.dme | 1 - 5 files changed, 156 insertions(+), 189 deletions(-) delete mode 100755 modular_citadel/code/game/objects/items/storage/firstaid.dm delete mode 100644 modular_citadel/icons/firstaid.dmi diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 822a1d5011..34523b0b5f 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -18,6 +18,12 @@ throw_speed = 3 throw_range = 7 var/empty = FALSE + var/list/possible_icons = list("firstaid","firstaid2","firstaid3","firstaid4") + +/obj/item/storage/firstaid/Initialize(mapload) + . = ..() + if(LAZYLEN(possible_icons)) + icon_state = pick(possible_icons) /obj/item/storage/firstaid/regular icon_state = "firstaid" @@ -56,17 +62,14 @@ /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" + possible_icons = list("burn","burn2","burn3","burn4") /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins rubbing \the [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to start a fire!") return FIRELOSS -/obj/item/storage/firstaid/fire/Initialize(mapload) - . = ..() - icon_state = pick("ointment","firefirstaid") - /obj/item/storage/firstaid/fire/PopulateContents() if(empty) return @@ -80,17 +83,14 @@ /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" + possible_icons = list("toxin","toxin2","toxin3","toxin4") /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return TOXLOSS -/obj/item/storage/firstaid/toxin/Initialize(mapload) - . = ..() - icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") - /obj/item/storage/firstaid/toxin/PopulateContents() if(empty) return @@ -103,8 +103,9 @@ /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 = "rad" item_state = "firstaid-toxin" + possible_icons = list("rad","rad2","rad3") /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -128,8 +129,9 @@ /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" + possible_icons = list("oxy", "oxy2", "oxy3", "oxy4") /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!") @@ -149,6 +151,7 @@ desc = "A first aid kit for when you get toolboxed." icon_state = "brute" item_state = "firstaid-brute" + possible_icons = list("brute", "brute2", "brute3", "brute4") /obj/item/storage/firstaid/brute/suicide_act(mob/living/carbon/user) 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!") @@ -166,7 +169,8 @@ /obj/item/storage/firstaid/tactical name = "combat medical kit" desc = "I hope you've got insurance." - icon_state = "bezerk" + icon_state = "tactical" + possible_icons = null /obj/item/storage/firstaid/tactical/ComponentInitialize() . = ..() @@ -389,3 +393,142 @@ /obj/item/organ_storage )) +//hijacking the minature first aids for hypospray boxes. <3 +/obj/item/storage/hypospraykit + name = "hypospray kit" + desc = "It's a kit containing a hypospray and specific treatment chemical-filled vials." + icon = 'modular_citadel/icons/firstaid.dmi' + icon_state = "firstaid-mini" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + throw_speed = 3 + throw_range = 7 + var/empty = FALSE + item_state = "firstaid" + +/obj/item/storage/hypospraykit/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 12 + STR.can_hold = typecacheof(list( + /obj/item/hypospray/mkii, + /obj/item/reagent_containers/glass/bottle/vial)) + +/obj/item/storage/hypospraykit/regular + icon_state = "firstaid-mini" + desc = "A hypospray kit with general use vials." + +/obj/item/storage/hypospraykit/regular/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/tricord(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src) + +/obj/item/storage/hypospraykit/fire + name = "burn treatment hypospray kit" + desc = "A specialized hypospray kit for burn treatments. Apply with sass." + icon_state = "burn-mini" + item_state = "firstaid-ointment" + +/obj/item/storage/hypospraykit/fire/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/burn(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src) + +/obj/item/storage/hypospraykit/toxin + name = "toxin treatment hypospray kit" + icon_state = "toxin-mini" + item_state = "firstaid-toxin" + +/obj/item/storage/hypospraykit/toxin/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/toxin(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src) + +/obj/item/storage/hypospraykit/o2 + name = "oxygen deprivation hypospray kit" + icon_state = "oxy-mini" + item_state = "firstaid-o2" + +/obj/item/storage/hypospraykit/o2/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/oxygen(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src) + +/obj/item/storage/hypospraykit/enlarge + name = "organomegaly trauma hypospray kit" + icon_state = "enlarge-mini" + item_state = "firstaid-brute" + +/obj/item/storage/hypospraykit/enlarge/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/enlarge(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src) + +/obj/item/storage/hypospraykit/brute + name = "brute trauma hypospray kit" + icon_state = "brute-mini" + item_state = "firstaid-brute" + +/obj/item/storage/hypospraykit/brute/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/brute(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src) + new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src) + +/obj/item/storage/hypospraykit/tactical + name = "combat hypospray kit" + desc = "A hypospray kit best suited for combat situations." + icon_state = "tactical-mini" + +/obj/item/storage/hypospraykit/tactical/PopulateContents() + if(empty) + return + new /obj/item/defibrillator/compact/combat/loaded(src) + new /obj/item/hypospray/mkii/CMO/combat(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src) + +/obj/item/storage/hypospraykit/cmo + name = "deluxe hypospray kit" + desc = "A kit containing a Deluxe hypospray and Vials." + icon_state = "tactical-mini" + +/obj/item/storage/hypospraykit/cmo/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 6 + STR.can_hold = typecacheof(list( + /obj/item/hypospray/mkii, + /obj/item/reagent_containers/glass/bottle/vial)) + +/obj/item/storage/hypospraykit/cmo/PopulateContents() + if(empty) + return + new /obj/item/hypospray/mkii/CMO(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh(src) + +/obj/item/storage/box/vials + name = "box of hypovials" + +/obj/item/storage/box/vials/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/reagent_containers/glass/bottle/vial/small( src ) diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 3b8b67ea5c9a35cc7da3c35671a32b5c850a0b4a..8ede8c66ab0618619b04dc47f50dc8d3052af17d 100644 GIT binary patch literal 71380 zcmbTdby!tT6gIjE=~M~n5|I#)&VwQ$BB6ALbax*RDM`Vglt#Kc57J2Ip}V`|z~S7D zzwi6*eV%*2=ehU(abVBvnc1_}%&d9eHETYrD9I7xQQ-jqK=@kz)jI${mjZtbI9Ong zo&AI@0NnfPt)}Jr%FM;o*~-z?%E2B0Jbz{<^*hfB5_Aoozu#r)Di*u7bvb&xQrXXF zl>-F`<&7U}JWLPB()7Nj(
(Qz~edUf54(r)tB-zs9V@;heK;bR*5&gn1etc9RnBZ^7kYTP2u@2J8*tUQ&C
zma$)XS{)LATlLU7S%|u2dHd!2l=7VR7Q|zXjb1|+1Mqk(v@ceIVy!
zG}_O%-u(ura>D1&!7*if9Sn9AtyDl%mXiKu3#g~x%`;eRpd>%XF!w~beWlL$Ay8IG
zGHe@!2Kq41;}hD!x9N|0_oj`e1Mdm@FQEer7vmD1g`uC}GnkLeFgd#$lCc9?nNb)Q
zUxW})wSv6a^?045mESjYOJ%WedjJ$={lJ$`XSVq;8Umz^E~K>E2EcnUU-uEe!y2;<
zO1k$%iBeE8AKfAE5_?9ljw+Kl+b0iO^BJ)
zsBMttm-*cSyps4)RDWA(LAQ#}O@;_VPU`ufUhn4jlFDh|r<>uGX7
@R
zt~u8?v@yj1xSPr!9+;V})FAc*%6L6*6E{@USboZR?l=N1)g?8FiXU%*AtI@iwgUGD
z_InI;TU!7iDT5rce-B^iauWAJrY=U+L7}qfwX0QFhA5r++#NUy>A>S#ec+FmQ-!;{
zklN!Vaj2YwxBJqr=k_*{P@I%(`(p
zBspC#oK^|wB>vfS5_=n)(vvv_`0oRPgC50C$?S%AQ$@c9K4$y8kMovNFT$VW_t+nRLbxvvaV`;;6
zU*96f-O-0*2NPJ@&EdQ`J8yluTAJZ~I)x%uEe!QD5Ye$^pQo2$*2j6^izT1yk&Yzj
z9Y;o36?A38{c$ur>aX1rBy+93Hjr=4CsA1o0j^tG7Pz(Kbr+f8*3#3HH#1|{-{03;
z2zmIW=);y|A4^m%;_zJyV%m>e;b)ryL@o?{B_HViVQx<%
s>YILD4-;t2Z4ll&zt}zymr5@wt