From dfda25ff4f1a2b7c757b72e228976a92d1962c57 Mon Sep 17 00:00:00 2001 From: trollbreeder Date: Wed, 1 Apr 2020 23:06:59 +0200 Subject: [PATCH] [Please review me] Operation: Funky Nostaligia 2. Changes charliestation medkit icon, and changes heirloom item for MDs to an old medkit. (#50210) * Operation: Funky Nostaligia 2 the last one failed because i'm a clown * Fix typo in icon state Please dont kill me if this causes merge conflix because this happened the last time i tried doing this * GET THE HELL OUT, MERGE CONFLICTS --- code/datums/traits/negative.dm | 6 +++--- code/game/objects/items/storage/firstaid.dm | 6 +++++- icons/obj/storage.dmi | Bin 78663 -> 78661 bytes 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 4514573a42a..eb689593f03 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -148,11 +148,11 @@ heirloom_type = /obj/item/clothing/under/shorts/purple //Medical if("Chief Medical Officer") - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + heirloom_type = /obj/item/storage/firstaid/ancient/heirloom if("Medical Doctor") - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + heirloom_type = /obj/item/storage/firstaid/ancient/heirloom if("Paramedic") - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + heirloom_type = /obj/item/storage/firstaid/ancient/heirloom if("Psychologist") heirloom_type = /obj/item/storage/pill_bottle if("Chemist") diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 8f3b5a7835e..f92938e3fa7 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -114,7 +114,7 @@ generate_items_inside(items_inside,src) /obj/item/storage/firstaid/ancient - icon_state = "firstaid" + icon_state = "oldfirstaid" desc = "A first aid kit with the ability to heal common types of injuries." /obj/item/storage/firstaid/ancient/PopulateContents() @@ -126,6 +126,10 @@ /obj/item/stack/medical/ointment= 3) generate_items_inside(items_inside,src) +/obj/item/storage/firstaid/ancient/heirloom + desc = "A first aid kit with the ability to heal common types of injuries. You start thinking of the good old days just by looking at it." + empty = TRUE // long since been ransacked by hungry powergaming assistants breaking into med storage + /obj/item/storage/firstaid/fire name = "burn treatment kit" desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down." diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 2dcde5a0f55b6b063b4444d58a34e86df2c03940..f2c920324241dbf6564eba777541498776e8386f 100644 GIT binary patch delta 1237 zcmV;`1SFRk0&Fp8B zvV&kxQy~F6p^0~hpItzTfKeiTo1@&Z?Yt3SK?gc&=6VMfd?G(k$8XmPZq^FktQFLa zf9gBI6)ZranNHerE|0C)kpf$_rxJMOPKfHOcS2NO!4snTDxMJGE9s32H%V6;$U2SF z?K;7-IA^JD&QiTOOLcvg>Izf!8iSw6wyxC8F*3tNx`-=4jbdh%dlGkbh+KniVP`yD=MNe!R0HWHF~c!cX#e}v{U zMh+A)zqOz+s9-YZ00XY>&|eUJ)hTejen6*4d8}su9^fqT4oGN?9H>6EfBpIKL%k^( zv9mVJZ3`T=57;X(FMUKK?&C;6$_0Bkn5Oz6x~AHotQ%4&tID7e|Pu$lcDH$nTwrcYxWuYdN$Q&=h$+urGbJhEJ4A^&1a2ID_i--dX9fKOx_hvWS+!>|PXX>TyS+h5qoGP$Ejd=px-)gXmYywXzCB^9PnRYQ^-DmnX{g686HRQ6y5=+DE05^LN6o;rJc=l3 zG0L326iR{Ye`!~L{>v@}`I5*FKuPd~X!QqwgUZXt`1(5(Bq11C@*{sf*l1sJb0=b}(E_ zCKw(y4ZQQSgI?e;6frop&L$*K*ECG(2QJXZtu$W8ky1cBg_UNhe{DhVzGw!qoH|L& zhCCi(E6rC*QWWbnb{EkY_B+l;2I9k8DF3dJINh$|55?az zL^tP%-kc-4K1Xx~iQMd5FSFt6M0RkYcleqyLf1wq;!_#b2NgxJh} zHYqy@_B0g|uoIeihxpkAqzD)#;9*@;LTb= zf8D6Q6I{UpB%0}@E$8ysiXADiReLIdSMG$UzIrD_^%XoJs;}Y+5x$b%sBn{XwSlbD zINh!jEQ@oN>gFufo3m8cXQ{3*Rj)Bf>YjJA@BVd693K_VbYRR)bLxb#lY)xxfuOw@ z<=#=(@Hmwnj^~l$iq=OU$T-053^X0pe-BQ#Kf)y3;xl2wQRE#9vJI${(N~=U*Xsv#ij>EC2H*kC67PV7*2sbCQ~TGSA3xNa zk`X&=!`!yOQTu?s0`t;GG~zyv1T>C{D)#q8_yd5o@6i?AMx5!=U#MKLhl6RVPqtI+ zJoi115ZH0T_D<0)#NCN01pfS`e|dg)zdsp@ewVq}Iksk>v9D)SZFY_=_gWe#$l}sd zgmFhHfyeSA`pSTP_XKxw2DXSepwKa>QGIWAv(24RDt)G2>Yg=wqsgfP8`PL5z)jxw zf?aKPSO%F&&ywq0(Gi$LN!^ZP)cblixAgS)43xdRa4H(LdnOotdP#e|e>aNjr)Dv7 zEWox(>`jx7;@v~B=BR5vBfj#8ZhX`XOv|H) zk`|-P=}Vy$$o`jh_2<9rQjjl+`~Z{$Pl#53@HeQue2lLj)hLm7zYuVNI-x;7cewX# zr>F)vnFYk$w^7c>k?{8{e@GzM#|N-}rCvzDoc3hhq!zNCPAsa?>9#Qr4H7ypyo)nK zg8vA}-=A=Lr~cl5?|t$v1@TD!7deVSUk@GAoiT6;S|%}YOEXZ($dbCqO@yl3L1zcU z#bkovQPaRXKRf6J4nq-xQ|oL(0(DKpq<-K6ecVdpbsQ-L#8X&lf0o)71n-Mx5X-5P z#B9jpA-2+dr6fhMPGffwjbXpzd}JU#%!wrCo`EzdjiVy#At}!hc$FkzMR)<5JX^($%?TCWx#(05gIh6@6XCo=_tiC(4&IgF0$zh%v9iih&=8i~{GD*jOX zJwtSJj_A!fqU&=+SCGif&PDF#vFSLmNj)q2s7T_q2$GmQI7oV$CP@suZ+z4oey!0& zO7$(@bMpNNMB0*CiN&a>HUCwJ`(g9(^M}oc-#=ac10J^$zo-AVeS?Aqw}J)%!z_?Q BcaQ)8