From ed32eddfb23c4723a17a57d51ad0ba0d79fe7e18 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 11 Dec 2023 11:53:15 +0100 Subject: [PATCH] Leviathan key is now wearable on the mask slot. (#17850) * Leviathan key is now wearable on the mask slot. * stuff --------- Co-authored-by: Matt Atlas --- .../ship_weaponry/weaponry/leviathan.dm | 6 ++- html/changelogs/mattatlas-levikey.yml | 41 ++++++++++++++++++ .../ship_guns/zat_confirmation_terminals.dmi | Bin 2062 -> 2264 bytes 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-levikey.yml diff --git a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm index 4450ad34443..bbeaa47ef51 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm @@ -210,9 +210,13 @@ /obj/item/leviathan_key name = "leviathan activation key" desc = "A key made of hardlight used to activate the Leviathan. It is a software-controlled morphing key that uses self-replicating encryption: \ - it cannot be replicated at all. Most importantly, if it is stolen, it can simply be deactivated by the SCC. A marvel of modern technology!" + it cannot be replicated at all. Most importantly, if it is stolen, it can simply be deactivated by the SCC. A marvel of modern technology! \ + If you're vain, you could also probably wear it as a necklace." icon = 'icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi' icon_state = "cannon_key" + item_state = "cannon_key" + contained_sprite = TRUE + slot_flags = SLOT_MASK /obj/item/leviathan_case name = "leviathan key case" diff --git a/html/changelogs/mattatlas-levikey.yml b/html/changelogs/mattatlas-levikey.yml new file mode 100644 index 00000000000..48fe7d6290b --- /dev/null +++ b/html/changelogs/mattatlas-levikey.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "The leviathan key can now be worn around the neck." diff --git a/icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi b/icons/obj/machinery/ship_guns/zat_confirmation_terminals.dmi index 0ff15a5e50127da3c06f0968764edf7b93f919cc..01bb9e4a1b4d945be4d9db7f5d0a1cc29f5c1012 100644 GIT binary patch delta 2201 zcmV;K2xj+=5ZDnViBL{Q4GJ0x0000DNk~Le0002M0001>2m=5B0B!b@ZvX%QU6CbN zfB%4h^z`)OfFDZ*Bkpc$}@1 z%L>9U5JlI?R|LCN(VDFrQN)G*LW%7(4UI`jqT=5>z7?&tAlc00+&jZSA~u=L7b`Yh zF6a)NSJtpG48Tnbku?kuoFpRtBM~Sw!`exQ*c5q5ca4i(trsdzZJ()qxt)9F%It{znbg)+@ zdv#lHL$D@Ewe@vY@AOY+y0Vo6Uu*qg%e%gWLy`&)je~AruLWuw(Nq|N>!YFtf0}H> zgXS-E#Ad7M`BxkPIvDAOwu#lM000LrNkljdGhh5QPyEy%oqUCbnybY2W`b zuO$Ao(k>Wd0%UYdl8HZ$y$5NLa_F6#BvDaO-$E?V!Fb9Tcf|A)$Kv`0ss1Lo{b_$= z0cS$Xz5?Txwy(gr5bg`!%vorFf2G{#z(Bw~0|EC6z<8z~`k2cFOS=&;4*C(`!sD!U zfOF^o;lKgGvur-!kpWv>HkZ2wKo5ilU=L6Qc0J(nU=F{F@5n%VhG+5}O`-451KC6m zAbdwtXju<Zo zONtK$8YR8(Ik*{@IG6GMK-9MqxWd1{w-(qgv#`P`zPWUPtSgT&Fv>UAcNl?123Vl? z^0f_^R4N~uJje3+e`4ST#?`=;&z~}|pa&S5yS$G-XW;b_SenmI@uv*HKe%S`rP1DG z^!J>D*B7#!Dj;uoLGhyDisEWkf$m0m9(N4D>@hR|d1wG~*TCc)hg*Gw%brS)f0cpp ztBft}bUKj+XoFwU15b}X{g8`N*$d%!P0X^(+1iV$wP7BU$U}z>e!llC{AFbSCr+8lg{DbQ4JV~nZcDtR;aW4OW0`I26OC>%otv;&f`B1^y z3z;@>F3YSe&u7AA-?zdpT!Sddo6xAj^CMcT=G$@X^XM0Jt{r zzzlGa_n)7m*<{i40_Cdb3Ui=a{8oNu`cZ}>e{j9pDRR9$>=BHB!&P=gM_~E}!!oW7 zl((|{)Q`Y`F8OY!$m9C3hi3qAl|kMYkURN%jucopyg;~exWWvWCf3!LpFt1k8Qz@X z`{Q8`e+s!=Wp`o<(fRv3c*5;f=yta9r_iHmQgRA)ynZN7H1Sye{tj-hLgpG|4yuXo zf7gdSs3um|haTVzn?j@c`x|&;psWAoCa%qb&yf+(!*2hwXHAHjBk^|O@B-n=;mYT& zfu@H)eFK+?CLXvoz&L84xq7^m&rkEDSqE$n8wZ|&`*;&OT#*LYun^=#KHn__1;M+8 zK!rSM)&Z=En+h*v69ZnG6NDOAl+RD|f23Il&Ye61X2VQ1G2pcwV8p<>`F&%cA`IvX z&vuJRi~!*FCNgGV)%?EU)v%j}1`@l!JDbg#p6cfC3Y_BIC#;s=H*yS=&_IiX_#ig? zQ@kx;wfw%V!qp#->6s09HIKIyaK27{-xl#_kZ&O1NP$y)byd~)=P%{!YhnT{f96q9 zQBhG*QBm*ISN&6mwWJPiK-Yh02P#9J{M&v}`uA5qRw`&zs;WU=o`E?eodiuHv(J;WhM~X0dJTfBX9BIyY~jH z%>4rd=H2>d?@4k>Z$@}r`n bqPEcg5wO-^nfz3z00000NkvXXu0mjf=z=^l delta 1998 zcmV;<2Qm2A5snZgiBL{Q4GJ0x0000DNk~Le0001>0001>2m=5B0K5^G9{>OVRFNfE ze~T5-Z2$lO0d!JMQvg8b*k%9#0O@*ESad{Xb7OL8aCB*JZU6vyoUM|}4uUWcMc3_D zG`L0MgRL6_F)Z{KNQJR9U`yJf@$Vf$jRsLkOgHnm_snF{5nDy;c+0{~Opjo!)QT-x zFqu+vl9|gfSAosmL-8Q>^&TKsL>D-3#W^~4I0H1n}(;3QS{O54@WX_cg< zwtc9s`lmD9w3Pwdi+;1^!(YHTNx6lugYLrd0IB{eO}SFIK05lOBNlDL=AT~xe>DHw zld|&4w*UYJb4f%&RCt{2oQ-y)DiDB0uy;|?HRh+WzW;k(Km`UEF-cR+9wxRq&1dcB zFrb;u*`mmiBgd*BLF|l|git4ld|_W)?oi5ajOu6o6A3tBGV~rXuIaQ#j5Fr$a3?3B zAStQOfndNr!GL=LFrDR8JY}I=5aC^#yK>MaA1h=stWmz1hrkYBnWCS z6ofU13CuO<@u0@m@*N3I8C(#|HJGfy>WypATgih1Y{u0Nq-5|)$V%!SU{kKofY1_z zEHrS2Tk`P?q_FjuKd6`3K6t^jE=(~v!;QJzq14jg4AghF4_@eL9h`xCe}HXyAr~G> z83mzVV*B8Q$DFiy269`S(ZusNkE_V5C0> zYK$jp5a(uy|JfS!R`Pf24|2%)FY?X%f4M)H`-5Be|9+-F$RX#y$T#o*<^Evq4{qK6 z%l*L|IdbG!5hRG6@fH0$=Z1*Kcx`zd6N@zo!V z+K4B2;27s4uQ6Vayuo-ga)EIX3PwM>#W5ZVLLLf29tuMKj)L!5gIn{r8Dj5B5(s)% zl0eYAk_3X@l_U`Kt|U-!u|LN#ZUsqMLtZOx1xeXJ-Y9MbNhu%~in|%i{lQoE2RX*) zA;$PT#2BB47~^J$e-r&Vj&UQ1a3hFtBZzP-NEZ8Z9OE{Fac(mh=Qe|JZUld#zgI(E z`@Dg?@wtFp(0{2v$T2<-F~;X1#`rwM7`H>b+@IqZH-ZQ^f(SQ)2)C1Dxj)A-ZYBxB z%_Kp%nIs6ef@2gWyc*$g&Szf7c|G$c&YPKwI2XA;m;(e@f1x(uNk8{yh=fOYHD4o0 z=3httz)SfW!QE#t3qC8DYw)=Y!W-US=PL}iUZ|4?aBqaR;Hescw`vj24dqc@8(v3w zV|WuYOwKa>tB1n@6-=GLb9_w(DLtrAZ?__xtNUJ!WilhYc6c4(jl-LV1Zhb>wO~o3 z8IZ3ZUdPu6e-e85{5E`GM77m4lpIb0SH(~qkLWnIl||Kutxa2 z5H=xKS3)S@O%qDI6ZmDWFLX`~h8Mf7c>!-HqSwNWf4SV_gUJVaGqE`@=pQB@3LbXJ zryDM{mhY73$dTjC16&KYmWjmE@9bY4PxMCGC;7T~JcI4Ady21&hXvc?>C`PKr1)vHb!9 zH)U|{f7t0f#i?7*aX%=SUZ|zuv2CliJsw>{ouONQfdU=MMOB^Gq)_^KDO_$Y6{IV# zRV4+h$``yT10~Q;;RymR1^X3(qVis#Oc*~AGn7;4+J0B^(S{kkT=WoL&b{7(3_4s? zmmq^;7}V3?`c?i2r}}fGY_DzmEgylPRJ!RQf9x;4-aJ9TMFn{=&W52FWDsPAfS5UW+s!$-+ zf1eu#XTOIh$)GM+)XU%?T)$E`x+48SF*a><6GsH?uPK9ij(q!q=fotjTniEk1P37} zvE!!|f&`}ebK^Rw=ZG@&1aHfe#Ni?kbkaBZ*$)o7g2XO_BGR85*TL8%84b?pBmsO- z2|xvLzZLyCy$&Ad@C4Nj6*fr#AM^kLf5D-!>kI0)ra!0F!Kk1#IO!Z^($8N?>c+81qBOz|8P_{1G3cA=3OaLd>rP1E&8SVbBAz|0iPHaJfI%ecA8@10K1ZO7Vg%>m{S>mXH4|Ab&p4 g0s0}HBgZb|e_%e;680iuGXMYp07*qoM6N<$g5T7^C;$Ke