From 82daa9b75ef4daaf1d87a2545e90b24176a203a7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 10 Nov 2019 11:30:33 -0700
Subject: [PATCH] Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
---
code/game/objects/items/theft_tools.dm | 26 +++++++++++++++-
code/modules/cargo/packs.dm | 18 +++++------
code/modules/cargo/packs/livestock.dm | 7 -----
code/modules/cargo/packs/science.dm | 40 ++++++++++++++++++++++++-
icons/obj/nuke_tools.dmi | Bin 4423 -> 5017 bytes
5 files changed, 73 insertions(+), 18 deletions(-)
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index 243787dc..9b9fae7c 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -49,6 +49,10 @@
lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi'
var/obj/item/nuke_core/core
+ var/nt =FALSE //For the lid
+
+/obj/item/nuke_core_container/nt
+ nt = TRUE
/obj/item/nuke_core_container/Destroy()
QDEL_NULL(core)
@@ -67,10 +71,13 @@
/obj/item/nuke_core_container/proc/seal()
if(istype(core))
STOP_PROCESSING(SSobj, core)
- icon_state = "core_container_sealed"
playsound(src, 'sound/items/deconstruct.ogg', 60, 1)
if(ismob(loc))
to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.")
+ if(nt != TRUE)
+ icon_state = "core_container_sealed"
+ else
+ icon_state = "core_container_sealed_nt"
/obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user)
if(istype(core))
@@ -92,6 +99,11 @@
toolspeed = 0.5
random_color = FALSE
+/obj/item/screwdriver/nuke/nt
+ desc = "A screwdriver with an ultra thin diamon tip."
+ toolspeed = 0.25
+ icon_state = "screwdriver_nt"
+
/obj/item/paper/guides/antag/nuke_instructions
info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:
\
D=u3Vd}OC2!74_}>!DXf9!$DvJgV^jR`E3Cqj zPGn-h!riztKo)@#xI?RUm)=GLs}9A`%HMrsV^d$ofyDz91~)Y1KgoX(W1xk!tpp8l zKTc@3VzojP(fa(P5Xa~PKimSpiY2sLRu|TO?;FNR46^rj0vbzsS%3cgIpOj=*+-H& z0Z-oKDmus%7P^uC!?hz~J{E$`6!_|>1}|fgcjINFpLFN)_;@k=Xh(mU^^a^sV&aq- z^Yop1W3T*N1!MSht#Pq9mC?_)a8xczvGo?Sh1dxTzD9}JP^5Q{xKDFQpM3f`ys`gA zl-LO{Uy>Uf$1$O1_%rY9BmH|q@cb;4T);_w;SV= zj5c3jlH_st^dC_x2n%m lozLkwt=um%DgNfUoB;v;7; z{WJyGuGtA92kpYLy#b;9Qb+%T)6q(%9;p_icx>u{DpnwP8!RCt&WekbQ>SHb>?Z!o z)WQo7Ab`^S(pWiMX=^{re^1`F2Fi)QJkA+auyACabI2$H*tL$Az&uTa53XsMCtZ2a zb)F#ihl?%BV^9#upHDa}(ix5P+uR7QZ`T$a|HrhC(eZ{kJH3}cGM$A!X`xiMx!>5Z z)|k6 o#TPa>(2iW+`P8M_V!qO-gCp z6YTrE4t+>|tCp&pvs{wuQeuSF=$c$BvBt_C-?D~j&Z=B=Xg5`l^dC9xvioS_@bS@1 zLPceeOQ tt@G}176o0ZkfG(8u+(8iK5Rxi8xO4P5n zC>QS68~O3*uY{kaGU)QkW^4R 5}r6i@(zKXuxlHdD$j@rH$$i)GP5{Z2sMUa9nBbZ3wLqr>)D17Ettn!dT4cR1yp0&RTwjBdeh z@*@Ya^t)TS1>2DRH|au{q|*si?19nGjV+3l)W4yWC71PpuPT^U-ZgynVEu_~R2mBj z2SNw9GZG^IPlzgldH;Tfjve#w7#<+1WSY2yxWAFJq)RrB%@y2KAyFc(2)As6Ev9dA z3A-Z>=f^SUi&_KXzwz3{qzD!jhfCv_g>O$&hzb23J!GQ_&N}e=U9Arr+FhAd=v_8l zM)5#DiI6zrb4dlg$?g2VC@qKD%`TX{yQfbRkGJPA7s*^+b1@ScXMZhx*fy^<;u6Xx z;lDMVmOua0T#4PU(HezH35d$7H{Q|0af GdtBxVZHdR&P|K z*4ae-b=G l-Dz53K3`i=h{18qng3|Cxx zS)M^W$n+sH?zv=RfWR4mN#A<#cW*E+QdO2x-F@nPqu!SR==bP;yB7i;I*Ly8tb0~p zWb_ek$(_t^ljF;XvE~i!da2XZgCO@z<&3SbA*L&oaqnku^1~`K=tz`Hz0r@9E}M+R z7EC++W}51WVmWlP>ALrSu}MDx#Fe3CNL~jerO1Jd(e(e#*>B$Yj|*-HQ7otgtmsxN zd_qXBfd$5ycYL!TZpP07E8v(G9k?M6eMArPmRNbcfc5X*24ULq4f5)SnM6{1fceys zw@;Qze7 -fa%Vp8OsnBnU9Q--MS-pd zn&FE@LF}UON`BHqyw-(t=;kPDH!1(t`N%RQk1(6`AN`~L7URQl?nB&xMyCs@9pmA# z_BL7dsX$B*b6yI6_hF6R0jq4(wB&KMO0l0hRsZN;qlenHGAAsj6O6gE2ug $L+22Y?ya90RRgRF5wj1C3pql{5$>$jO0{|y>G@vYvwu6JNMMq+6>*HBbozA z|G@yL%Bmf<_Nw6|S7!oLj?`9n2D#K)EBP7cB5MC~)cxUi&ZdTx=JU{A;g={J+=lxr zT~IHx6lwgqe|nteHbBlG-O-t+aP+?45krDinSN5Tj~JZr1V|Wd>?H1_mkp0sFNb(? z?4@zmywJ&Y_qVpwo4y6}jIS47Z~vyLR*uqXFq^yu>%${`S_R34Nyt+afD?`n{SqH{ z_g>z<7Sj{Cd|9}n+TXf39`A9L 7 (L4#CE2$RtLtR8f@u$-tX|k4c%Z-g8@y^A84YH?P5l z#Q7hAU8xF66#CSlnU7gYM$7q6j5d^~Jd^@gOzuB>&q2oGh!jywo!}+U(bm=F2O5c| z`&nNX7A) 1}SkIGRy0=LFN1lW1Q={O~+q~`p@ zfyRwgpUuH}3;f$trCKu>7y@~*@`L5XPwtD~K*sRcb(SkvGIDaLj%R&g>^8yj8oZP( zEiHy)v3{MYqe7UmjW$87pOrdus3@x#CO|QS-dm3Vl-eLMU5U5R=fpBOU_mB_TFI48 z_75%B|Hz*IqY`H>Su*uGO^E>Vs-4`17p*N7bIh&Ab6@%k7_RShSIpc;AX3X_Cw;z; z@>&;cTd!Y=; N$O^sw-*xK%0{m|`Ui1up8@#(XQBwj_7*K+t*afPMxPxpDX`3k0Hz;>jU zJYomCzeIV7|90o&-XNKl<3>^$; pB>JGI+It4z-ynxHGQs#yvxK-uTfF) zu?a16@v2O~C#XWHC`v@s?pwXdfDLe}5^0R`0(4MbrH|`*lttivq+%`ij-w&vX7|XN zRxaA4;XO>G2)$_8*AxippY*xzSdbq?@+@_Czx!b3O}b_=$tA6j@$9X4*mkUokM^-j zBD+GOF<~xq<3gw3PB{_uAqG0Tp9JT38Lo{^lNia{A;q|ys0p7YEI zS)&N(#Tp~=Y_34}OiH`N zDzjmm 5OR`?<><1gSTbFr(8NUE<$P=7ACy 8MwYwjO zmcBPBaXAm=wsN5}T1tu5AK?Q5#Pe_+BjE}dqG5HFBhnB3;_2lGAKve8h&yU#_x#ih zk2?|{FPiXCn$Ji{>(0KW0??-hGXN&o&XXL2lfrJ2@&Gg%Jef&gA|k@f(w$Cq?9198 zA-#3i2fiQboC d|A2WCRgL8c9_*Me3RfD?{PU3W zI@^vJa4}8E8I(#dZ7U@e$bMLjFN8t>F7LxiHg WcIL_T+4vrgl!hgJfV3J{Ak%bWSFb8oFl-|c% zb8I1xXFQ9uzwwlpyL*v_+Gaiti1ve3+~wkI{EOky(S@ENXj*Mqqa;Gw-nno$6oKCj z8`1H0fbw47qyhBx2^6is@bLQRCm{^kiz)-T5 1stA;exnQUSH znUOqL+cInW9WO`Y)>t&t(S40H+G3t9fnWZ#X=Ic#@F>vT&$+p84*5ibUIsG#XJzzz z%l7;uWc)y{u8<4fcVQj*B~~@F@5x-j^KY!rhjb5{zlvcCVa^R~Qk%-W$c+R0tB(YW zc#NVdh(Dt#2iqM~um$x~q9npSPlp;w#qAZ1M9G;Tr7Syu$b3#K ^Ns 9@gY*BSnObG(0%Z;}e8*tro%`sD_wKG0Muyl)ZkFSI7L Af&c&j delta 4309 zcmX|Fc{r4B7k `@|X$Py*Hnb$5PBN8b)*$HEb?4c-R z5VBQdH {ax7BdV0080@EYXE?pO%&z_>kG%T zEG~!*cV@eLh6w&pB@r|X7?vj1Th9}dLdwS_QVwYwFZ@|5y6dXKewbB3K8m^VN7L5Q zgma%|hx1e=3-cD&vY5_>Gc#XyfAzHO?CFDdZzE7CI+}bB{p~(tV))){=?AUm?8pve z2%jX@tFUwT`*+EvxVTM{v=l^zK+kHF-c9)t#%xxT`1dR?hC_?}wG<9j$c)iJ7xC8l zWdsomC6kQJ ~uAI44Z@6pbHXr|?uqI^0lsAUeib6^Bj(JA3AG0RXX} ztD$P<|7!I$=yht2ySoLRh}OI;dM-6l#uz0)K*~M&9&r_EToR&lwa-QMrwW_tDuKJZ z=mY<27NOG;vb;`eWy3d9Vc8^^GeZ1C{zYD{w 2SC?7aU8HaE`iuVL2@*02@JJ&8j6%y+my1j3os5Qa+Df(!T1?3~t+ z$B9oB>v2rG0%o-J`gM^Bn*-AZy Y?B?c`*g0|1~*;`7&_%bPn?S-a0IdN6*T z7{#7p*6h *o54@27* ze#auoqYVd2Z kiwbr;Z x{;WNgs~kwE6~LF>|9Xj_cbTrap_6*6l#z|x)_F=4JwJzT1*z1aQ! ziM;}otIILSVyp*B0Eedxf91`!06O}iW)umI`>ArN4?&z(B~j>;iH$xqnR>*~GIzOB zk VCsqKUAC>_w9yH)T9Wj9!)o!O#oDFMPEH`k0bXo zgZnIp`L4MtzK^RF@EdFWBPmXM$JgQxnuz(ge4`6@N+3!nQW%Bq@zLkajNJk@G408I zVeG>Oh7n^x$(V()#j8VmqNK0urwU-x8KUuPHSo#@M*!Z@yNY;73R5;d@EVxRVjQKf zxjfrIYL nB3z TF*cClJxNHOF&WsImo4PL$-GoL d+;!ucm z|4;4r;s-NI9gqr*YRJDKbZu9!aUBlHWh@Y_!TR-^A2SZnu?-C89AHq{w)qifzhZpX z6TZc2J?HN6V&&f7U8FRN{Qd&x__j17?Q7_klK}%5Z_R<%3^9~3PEREX;_7YLiQ3+2 zoq=^e6ximooAGS?i~N_i C%!3pVNN9$+ZDYwwdws(#Y zTq{uVslc<+l-arzyXmt*SJX=>jon&O2OmwPsf|WaL!Jyj154S$o^UJuEu&wbd&!_> znUNsvaOJ{lUbjVT w@Z~k7 z{NfgtyY;~fPI^$UrM{BAqpooQ3P^52i4Qvm9J=~ty$oIZ4cRG6D|@HV-Yi#reWEC_ z7+hSr`3mp-wD@RI{`XD%jz>8 r4p=F7ncz~oD{4jij3kw~UNQ$wAz>id z*Q$}Xas)k^6h4~q81ToGPrBwnQsQ?9fh^Ja>I&sgwN_}`phNSlF~EG-*)Qj)CMHs! z64YXJJ4%e0FfDo!rP9|HWl0cEi~OXMxgD+EbYQkj1uUf>F-cWpuP!EG^>CA~ZU4(M z(wi!g|1fgUif^(QjyPGPM$Pk##Fimcyx8(plK#LjN#o3{VEnwcpee=o=9>lNNLE0a znbKWtx|dzIDM)h0wO?VaIC;+rr}Y(c)2;__8ga(p!v0Urn{)xol+ZgPwOn?Y@;3dG z)KF?#V7J%tbJ2B&=|n6*S295>KjjJ5Jt#UoAKxfB!$P--AGIy~GxDwslh0=XZ;(#W zW<1@;n58NE3E~_ptZFG#dvf>E3#Ry&Dt;bD=Hzn899FDt7PjTOYLAJH#2%aypVm5X z+E$^olj7N;8| zuQI}WujgGg6foK?M>Qb)I&s=lQ+q}G%}xP_5k4+YlfSSeK{TMM!IGHT$?rV%8yXec z6ZE{SHEX}`e!o`Df6a&|WLC0I)~T1!Hju>hcuO+IRUS3cZJ5f 6i*d7ZPLC0kGN} zVi?R#V{7MWCkCW0UoO~B{7f2>RNegm58JHK5sPA#;@JKg7kR8F a6vts&HdI<5VsLJW0a{qzJpkJkz2O`blv6SskO i)YWoFyGM1GkNb@F^eWOfv~jBAx!m-=I6-KZn;rwoER=Mm@>@eyFpE~xF08-?C8 z(^Om@KXF(}QTIWqHGg+Le9y(haJrvr2}WH(s=|!yKE$480Q6I(R9%;smYz+;t$H?X zM6m$o6?Y^a`S{rV{_;8n9 M8pkQw{&PcTH3`#wAw4-UF|@Bwzb{=r;fah|)+rrT3k%K^Ic?5{p+F|D z#>u_4#&vhyP-brdsK~bl?>Blxgp}n7+{Lv$;u!J=6^Pi%I`w$wY@kTS%vl+rP0kSr zb1OvZOXXKq5{j_a^n)${<*-r*Vf^(`tpC;NStgkn;_@XHfbbe87Hc6vq-F4rPz@qk zZ5iA~J z3&@ VU%4rY5_|ib?s#HF#p-ekUGf)mWlJfhZ0fkbgI2%; z$aC{~jlU$N_wXCPM9s|acZ*3Xy#Za1=n#2JGGiAmsT2=KkH*UEk(z%}=Am3XFH4Iq zM=3Y&AV`{)5$|;32qIG2@9@Pry})K7ACXE1^5_qgYsIHsh7C4r(U4QR29w?^Xh@G{ z#U?Jw8zxS1R#+|-mwtcx@} <4}28`7j>2KiKShrm2YVw*MH^F6em z6tZ?=v|bqlo612w)l4pHnAbI&|ES!wU|DxlVix>GU-!WcZE0cWz1gWPo7(eYoY5oI zEo0P{fHhtSU^N v(Ok*o_sB27gL_5V^$Wf+?*+ z9yIW~y?l3jcQ@gnxkNk3>F0~zYK_xVpM#CnKf`o}sbtrcZ$3u#w4JL0nYZE%cVW>% zb$^sl=8WLoIp1WOZ~VnC6;Y`=LNrO9%axukWc=8Ag^=(h>)x-5{-Lg zMqQVmu9^MbAW8m+K_@J)u4>xYpcz$FS_Tr1u#m6;geu3t=yXD9Y5Kr$0C%odyc!59 zV-HqjGu;@^IlsFmB Fl0;m?IJyWxa{ zRR>q7_Arc?gKc`o+sJ;r7a!=SPc9426L1pN0QP1RBmv;loo}o_!E~_sod;GxNYMQB zDdeF~;u*V<74EMt32D?#vxUJ}`y!m*15L0UuOh?iG2#=-a~Ejj*a9o$mFN2qK$*o3 z1lT#;QeIeFgW2NAh!4-jEEs`8f3YVUxssLzWh0n9+I;4%hfhk`X1>AgOC5XlMg=_j zguZHIrv3qW#^P^Rg;a6Y< ynx~%hKQs($OLo^@l+SeoUf<>+C8<|H;Mg*67&c+Kr=Qwkb?g^4$>qxbu z?uK Hl+(}aaY|Zo SPtd