From d140b858ec7064b1a7f37af38789dd36cfdc33d7 Mon Sep 17 00:00:00 2001 From: datlo Date: Wed, 23 Jan 2019 21:36:08 +0000 Subject: [PATCH] Adds the oxygen grenade --- code/datums/supplypacks.dm | 4 +++- .../items/weapons/grenades/atmosgrenade.dm | 12 ++++++++---- .../closets/secure/engineering.dm | 2 ++ icons/obj/grenade.dmi | Bin 5547 -> 5606 bytes 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5a21c121b25..9c42d7c30dc 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -92,7 +92,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, - /obj/item/clothing/mask/gas) + /obj/item/clothing/mask/gas, + /obj/item/grenade/gas/oxygen, + /obj/item/grenade/gas/oxygen) cost = 35 containertype = /obj/structure/closet/crate/internals containername = "emergency crate" diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm index 02e21e31d39..96e2c57b1c3 100644 --- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm +++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm @@ -1,6 +1,3 @@ - - - /obj/item/grenade/gas name = "plasma fire grenade" desc = "A compressed plasma grenade, used to start horrific plasma fires." @@ -23,9 +20,16 @@ /obj/item/grenade/gas/knockout name = "knockout grenade" - desc = "A grenade that completely removes all air and heat from its detonation area." + desc = "A grenade that releases pure N2O gas." spawn_contents = SPAWN_20C | SPAWN_N2O +/obj/item/grenade/gas/oxygen + name = "oxygen grenade" + desc = "A grenade that releases pure O2 gas." + icon_state = "oxygen" + spawn_contents = SPAWN_20C | SPAWN_OXYGEN + spawn_amount = 500 + /obj/item/grenade/gluon desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also wet any nearby floors." name = "gluon grenade" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index fbe2c4d8356..7b07e003bca 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -135,6 +135,8 @@ new /obj/item/storage/backpack/satchel_eng(src) new /obj/item/storage/backpack/duffel/atmos(src) new /obj/item/extinguisher(src) + new /obj/item/grenade/gas/oxygen(src) + new /obj/item/grenade/gas/oxygen(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/tank/emergency_oxygen/engi(src) diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index e1b2164a39afeb2cb5e482df68b551ecc05b05ff..505305d4ede514c743b2d22040bdd616d1df71c7 100644 GIT binary patch delta 5141 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 delta 5041 zcmV;i6He^rE2}H8`~iOhdQ@0+L}hbha%pgMX>V=-0C=38m&Dk;V`;R3W}0BEqGX*)8~{A+`lEk-NXDtM@QL-Kt;rKMFvL`vtFs@y>dZTIz^E2 zDo?DqNl6RgkMw`iNi^gqihfUO$N3`8pXgiF;h#Xd@j?*M_XqP>b#APE2KE zETEG$RUS!!4|H<0ZtKf*tmoG)G6riUr9n2J*ZL^2cUXTZ9^h1}!eIEqsW%8&IwhY+ zC0AaSPmFB!#QZFt*qzpdt_s43yQXNTj)tV3I@+`z?YXQp!FEHDY_}xQ_BpMGZHryT zZM&gJwp)^D`<&Ke%USlNfs53=e1FM1SMP7wor@O%!dU|$>NzY?d&2pyq5PID?$XTt zx6)$wD9nGt_w8Hr1N8%Nq3C_-H2WU_01=BxL_t(|ob8>7e-p}p} zfWwF1&d$tFZ)ay`Uq+tCFbu;m48t%_I==54)pdU{-9GdBo;}zRy1FjDpUdI(yRC~O z_TPCKcS0H-~bV!n)(xOa6d7I?vM`F-}6I+ z>joF;o0!&3ZU@ef-{dF*OzWh<`M$os?CR10d>Un1rwu-M5bxljL%4qUu#;W|Ab(f! zeY+3qw(B>I?Vj1L-!y(Bf-FUm?fOk4-v>Ts_j_o&e$&XbxO_hD<&Z`P(eQ&s+x52` zfgX}tmx-OCg9E;11j+NjZ*Af9QQP%55(E7xJFeTOozQcE=wJ|%wu2%9Wf!_Ci2ngj zAGKb;_*8?UA0`O;jraRIsE7BMTz`|oU3Km?)bqju|WIU=FFzAg`mM?WzP=E!>`+(9`JfI5ighS{v&Z$091d4GSW^kyUS z@r^w3ZrgeVgX5?uKd`T(f@bwHy%sjuV*Ra0beG?TK3ozELk16p9h6hi=w6&?Kt4VQ z>|pmN=&MDr#rm5C;|T0LP*+##0A&E&6QJMQG|*)IZK0nK>PmVebfZ8{_#}x-ki3M! zYZ16|yGq-uzwIMP2z6aOp?|`Je^a>$DMb*?Zr9&7{YaQ@=;|#s!P6kMX;jjD2%J4R zQ-A9OI%&eJtE-{%Adont2j~Cp)Zcsr6yy9*!XuxuUdrc7_#-RWbfrhxc4=<0O;e6_`xIKDb6fYx9fsy|wWYkV}_cTruP?BKSR6MwrZKvxmnsNZk@ zM7rnUnmWNY7sR_NNFBP4)NdZ2Unv=;F~DdHq?xYYJhppfyMFW7jvm|fGYrEp48s8M zG{r1#I7@xR*$n|l9u?(_g`aBZ&f>^ohhLPxUl z(M!K!Yx%q7qk``qQGwrSaGM^QT<$hNUODn2k$+1vh|v3+dVi|&qfLDjFt~)KZ<@@XEswOu zs4zHazs%ZniGP2z+hBQbm5DDv^K9!@^JmM)kGI9B9Hq*j9#ZabI1I2Tf)YcF)cafX zgb*gn54Pxo$svpn0pt(@js?KT(L#A-L^yb4B=S%W5kb4b?Rxkt$>2r=K?Y-be~S(o zjFlg4(UZrBHm4H)P30z-GJm#wTskN$JQDgFj=^PEPk%BvyhIxj1YN>5_2yBKd1}+R zbosO85#gY;P z=%HNF$@|C4h#t~e^|AOigHE#$y0$iqxG=bk>4L6Vg!2y? zIN|hPVSh0wj_>W}&z58VLXLL^aHpPZaQLVi{RSInSI5}ia_08)XJv>sBQ)VTqD=?< z%{0dIXUl|tl%9Ef)321m7>!BtkJ2-b@t30I$U-?&NTp{U^REz+=U?i2)-f2p48t%C z!?;Vqb_05y0z1qw43llB2W5VcE@<8B{2+%eRDV*s_6KBJCn*$ghlvVKoIH8*1frij zb?Vef^z`^nD6Z=yg+d86IEugnpdJ|v>yg2*PVVL7x;`d>W#O*?Hn_1I2|1*zdtla3 zMs&(xuS6Iezg7ng)YXao)Lhqdm)I z(>pb+8jR*8spQ=e7SRskN2q)PR4YRrKPLTWfLC6i4L*~)YE^Wjm|M~B5kUa z7mXjF97K}alnlmB9~y)dZ|J}gkxE=8REYhG(6tc$4qy(4`I)GJC9H>}e&+01)ZvB> z8BFEp+9vdGfbh3uQa^jPbO!qXDIHHAEuKDo?%X+0CUsA@JeA*?dHvk!)4#?HFs(;z z>}{QsUwyjR4%-D!M4G9Y=clqZkuaqPA}RjFK@yjZDBLB)w70xs8N`qCwT`4h5Per<5y(@(?gmwEtq&~=@h zhE*o9o198)3x@@$!F`0mNCdgA(*~onh)Ah4=+Yxwr>8GX&p-|IeLRB0Z^cGB=(tWB z{L)n70pkhzLR8%d3>5Cbaa~JwocC?hy{6Vl(x9e zuui@bB3>ym6x2&i>ZK?{K)#me0M>+>LvR2ah7D#IhG7`y31p1;UTD+03(U=#)BX8> z`Gtk~d3dSDuDzib zjZuTWt0CcEaGffjQWp;G!4lW>b&|P%IeeO+r;lC5??I&gI-$=J_qgbN2a~R!6prE&sYNu zp2M$kP2G9~%iKWBz|?xB@nQEzH0_p8C_DF@5iUU;aAl za0Krg7(flA^uN9RcA_rqZ6pnc`NNZw7i9v##Kd@q$6^xjmPv!HNALk6LeuIMnb9I6 zc{<;f;$^*7}Kj|DywPu zdZVsx8-6FpFbu;m48t%C!!QiPFbuOREQh$OS3}&@DV77t@-UBx=hO0Ws@&~mK zYNCUF%}u@fVg19p=%A}Q$?^w9!Lskwl3y#?)~g@h6jYtnJ?fp@aZY{`7dKf{oPU_*NR(WL0s9JI5lTTKb z{gqnDNxgn^b#!#KD)dn&b;{t{^2%*NZDnO;EvbjL^?G&nj-b9O^rRlz);&6cKf3+t zXQG2%atA~GQ(XW2b6o#_;tO2Ai|O?*?~IO%4thWbg+5N`d-obFPe*XA_E}_La{m?d z*kDkP4F>hQcVWF=t=Gp#!wx3*U+A;rxE>n>>f;*aJ%tFa$p{7~8dCoh*QLRjE)B-? zyO>`8vMwVS)5i&28f2`zN(A4o-CkaS`fpj65p<`1r@HE>?$Hr{928fI$fK%ly?*`X z>P_TP)wWI=yc`6#iM0Z&diDDCJH%RnRh>3?dAYXy&ug#&mi212TCe`=25f+3T^M}p zjgOHhIq%vv{~Fvs`}&O=2X0{fv#q z`*4G`BiJK5XjZ2UwyEn!Fp=MCTpt=ZgFeYw*0m$p`2M+>*EJ)UAy8e5*v&Te7HX?$ zyVo9uVHk#gVHk#C7_-z{aZt}X^~F}YduUtFI`#R*rL_i2i}Rg5w5?|y5kK>5OAXfM zJ7dVUo_Xpbe&(AIB>LKAfL%T0egxPFN>{Jj(vt*_sE_z-q~Sn5a&)A_|@ersAi>R>bqu7L*F z(<6j|_a1uQL#TUF7w*C#Oy(C8`K{@7+XgBceE)tJzL3L>AsBL)&M&@vd3qYlZ@qMB zdiu(h6uNB#)ePQvwDEAmgAEq?BdG%hQ~A$o*@38Dg!D!S7Zw&!18nIbn_F8OTkD%1 zGzf=(`lC(QU@G;B&TlOS#l8U3Lx*957ry@H>jlJsg>S$67S+H1;d>+HB^w)?lJ#}K zz*yhd0u82;2hB(D!Z-i^1~uTj|9pq)Km7LxBjqKVTaO-z2n9ow(#iB(rR=~kf?++1 z;BLkC5TGzbY;0_8J&OJ$8c69%22+_U0h#}Q3h2$7%#XxPXwi-?*x1^L*a8eDbfqD} zcm)6WzaL$lMQm=wL%_ynqJfmIbd$3m!S)Q^fgys(f8LDjonDLB zjG_}8B2Zl+zu0sHySNMz?ym>S%YRc20l++$(&@$A=2`@($7>CL z+t+Qsu~2!VA;$pudlTp#rK_Nu{|f82-?^#0liLg<6!wqO?PB|_vC3QJaIFF91Et%= zcHTp;=S46K!!QiPFbu;m48wFm<+s|_vySckdA0ZNbspRM^Xl&3>pE0^t8G2&?9~3h zru58Xd+S0v^(f=m-h7izp36Ae+tZp<-d;BAu)&70Jp}ar5WzP&v+TtFzee}(%{uz~ z{~F%EH|yBmpO?_|C@cR@6XG7mof~)Fbu;mOi%ECKg699odG@W00000NkvXX Hu0mjfw_pO@