From a5e4016796eee07df3fcafff727d54a0ab926b74 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:58:08 +0100 Subject: [PATCH] Paper Stamp Tweaks (#4406) # About the pull request Makes the stamps a little bit more consistent and stops the confusion between WeyYu and centcom. # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: imageadd: Added a CMB stamp icon. imageadd: Changes the icon_state name of the WY stamp from centcom to weyyu. add: Changes EFTPOS stamp icon to use RD instead of weyyu. fix: Changes the pre-spawned QMs stamp to use the proper stamp. spellcheck: Renames Requisiton Officer's stamp to Quartermaster's Stamp. maptweak: Renamed the spare Req Officer's stamp to spare Quartermaster's stamp. /:cl: --- code/game/machinery/fax_machine.dm | 4 ++-- code/game/objects/items/tools/misc_tools.dm | 16 ++++++++++++---- code/modules/admin/topic/topic.dm | 4 ++-- code/modules/economy/ATM.dm | 4 ++-- code/modules/economy/EFTPOS.dm | 6 +++--- code/modules/paperwork/paper.dm | 2 +- icons/obj/items/paper.dmi | Bin 10808 -> 10761 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 5 ++--- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 783d24c00f2e..ff26ce802b08 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -396,7 +396,7 @@ var/list/alldepartments = list() P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." if("NC4 UA Federal Secure Network - CMB Relay") var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-uscm" // placeholder icon + stampoverlay.icon_state = "paper_stamp-cmb" if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp @@ -404,7 +404,7 @@ var/list/alldepartments = list() P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." if("Weyland-Yutani Quantum Relay") var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-weyyu" if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 505006285881..b5be55eed540 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -420,12 +420,20 @@ name = "internal affairs rubber stamp" icon_state = "stamp-intaff" -/obj/item/tool/stamp/centcomm - name = "centcomm rubber stamp" - icon_state = "stamp-cent" +/obj/item/tool/stamp/weyyu + name = "WY rubber stamp" + icon_state = "stamp-weyyu" + +/obj/item/tool/stamp/uscm + name = "USCM rubber stamp" + icon_state = "stamp-uscm" + +/obj/item/tool/stamp/cmb + name = "CMB rubber stamp" + icon_state = "stamp-cmb" /obj/item/tool/stamp/ro - name = "requisitions officer's rubber stamp" + name = "quartermaster's rubber stamp" icon_state = "stamp-ro" /obj/item/tool/carpenters_hammer //doesn't do anything, yet diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index a76be10e9c26..d7f6d7159675 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1502,7 +1502,7 @@ // Stamps var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-weyyu" if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp @@ -1584,7 +1584,7 @@ // Stamps var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-cmb" if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index ecf76b577c1d..2e9142dcef91 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -358,7 +358,7 @@ log transactions //stamp the paper var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-weyyu" if(!R.stamped) R.stamped = new R.stamped += /obj/item/tool/stamp @@ -400,7 +400,7 @@ log transactions //stamp the paper var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-weyyu" if(!R.stamped) R.stamped = new R.stamped += /obj/item/tool/stamp diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index fbaf1f52adea..a5b36fd0bf3e 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -47,12 +47,12 @@ //stamp the paper var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-rd" if(!R.stamped) R.stamped = new R.offset_x += 0 R.offset_y += 0 - R.ico += "paper_stamp-cent" + R.ico += "paper_stamp-rd" R.stamped += /obj/item/tool/stamp R.overlays += stampoverlay R.stamps += "
This paper has been stamped by the EFTPOS device." @@ -70,7 +70,7 @@ //stamp the paper var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cent" + stampoverlay.icon_state = "paper_stamp-rd" if(!R.stamped) R.stamped = new R.stamped += /obj/item/tool/stamp diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 3b10c757f2f4..f78ca9ef5473 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -427,7 +427,7 @@ var/image/stampoverlay = image('icons/obj/items/paper.dmi') var/x var/y - if(istype(P, /obj/item/tool/stamp/captain) || istype(P, /obj/item/tool/stamp/centcomm)) + if(istype(P, /obj/item/tool/stamp/captain) || istype(P, /obj/item/tool/stamp/weyyu)) x = rand(-2, 0) y = rand(-1, 2) else diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index d0c918a65e5900ed17adc93b4e2358c817297066..c39fede23679df75a697fd11e91c542059a6bcf2 100644 GIT binary patch literal 10761 zcmb7qcRXC**X}Wh77;z72GLt0K?I|hh)6=B1f!Rz(aRX3CpwAF5J7Z8bTex7PP8zH z-WkF$%pKp)d++DIzx&>|{4sORUi<8|%UOG^XFdCTc>YX{lKeI~005L4>dG$xfIuGq z;~>3;mvmYd?E?Ua#8+3}UD?Xb!qv{j-Okww0K79kC$~OZ5xcH3xud6CL8SWJdY01H z_K0Dh;&XbPmU5c%vnLy*;7QGEl=JS}(6KQC!UL8~osAT5-+2nD3htO0!RiDA&`d-o9?}AjZrP;^C6hqPu4_ zpn1{~CY(ThMADvutQeh0b}wMH6J=S`xAcRK+c9f4Yy9x~-ZSTd(tFX7cFf6ARyiN+ z09jzBL!F(n^?O2UM8C5>TXKZz(T?kmijDS)M=Nh5aw(2Ae-f8M#6@ho)Nnbi7PGgG zDvC`!YUdnJgcIs7m(3WmUC%AxqzRuBBj!E%A{QtY zrRRI)E3du&K2MT9?*1P8#wTvA(WlaC2`Kah^pra_b(Lv!dBfQ{A*#o`GB842S?^Xe zNLg9cjDRM-LO)QMTZn;!nkKA53oe%hM-ocrdzh8H)>D_TXyl=Qn61y3b zpW)_|oR~bq8K8c$E9Eojk7$Z2z_2lL0R6F%?KUebb^M%d8&IEl{H=ag97o{=$8|O- zvgm<&(ha6HcZ5uNotFdg4NKmVL z=m-`^#0Zmeo@22eiEjwh+_Yk7K{ZvJ`j>9c@%5k zb-kmOVPNT?Po+5X8Ey}90V=frWidl(v9I;FGH{^0*zK5vl#h?k<&okr7w&VBfD#(n ze^!-)k(FQ}3Oc);gftuQAtFBBKSeYN$OHNf?)*!C{ty5L1_t`IPMNh{ozPWrI3{e_ z&nQss$&>lE$uyx%467#b#Z3V|AN@XwB;wZ;+ zV^Rprd*VIok&HQ2X<23G=YRi5ddBf`I7jK>z}`Bh+~e}-*OuxERm()!YHsi(ToPjv z4S>_+<~EL4oOk;v1e2vvecne?;SI|H=a)diSk=ioO)NH;{c$F2p@mU#Svx~&WaH@L zNAgv12=xStq|RYM9{Sp(?C+fK_Sykb#iB}rL_sD#4tn>7RbxPLP}0kUWLwXhZS05P z*O`JCD5;d)EvH-FhppmdE^G1saboks*pOvG`W1Ba@c+HjUb^4p=H=^d2pAgRRWKUR zX&JEUbWSJbcFlVO>)5t7#p>$ny5G|~ zPFc5I4Z&7RB4D-llLc1Uzh>bWLpD;DPsU+sHx5axl5o#Bcr3+5@0`V2r$5g zD)<7zmNc;xFyA(UjVfh%HRR+RSNv$Wo$fX=tWVK`QMln_;$|g+nBc(ScNU_QjO2SJ z4z%pUv~uC{m76NICN6`GHNQL*Z_8sBLLiSLfcclx>KSF);cUDynccS|NeO;T}D3`^@{sYJLpNg8KMa4d>UD2+96JQfQBaRj8j4BEQj*t#*FII zraxx7dU}sD*%=tZ%IE#Gl0EJjen@nCcAZ(`y4z}hyc~AFJ@z&0+RXp~0@Kt$*jO=B0lBq3H&dHg?^>R<|uG#R!q*SJ!&(h=HXXqCVrIA@C zJ}dNzGUP)1`~;dJVtfKE8i{3U&xd(BIy$5>A^Q3e_%g|U4SDhE>=&-+IhF^UxFXmc z^$c+)MvNw^>UuY>2?xuJME`15-tgQg}do*WO^U4fjJITDbYQNF#?OaN6 zpu0L%7V)DTRD($*A71JD1FDuC*n2inYM<=?*TukK<8gWfpPNWfRr zYHCsjMwj_@t_!vrZ&c;UwXgaa2NfZy#P0f#{T=inT{r*z=K91uj`y+qw$u&Q$7P+y z=PGh7)Y38vfn;13D6X80%oN^t1QC)T_C1ZUKO@YPW>nw!Mm0eB;au_-9Wl4=_!}5}z|YxD z8n+P7bqnk%^fQ(Z!u-WF5V-HM23M5QGx*SaUPb*YFLG|y z8l+I3CA;Ia#_)N@_?j;wYQ-k12@BQ157}rCZYS=XpT5$a^#%0%^duGl3Z7-U)<+pZ z8G>>5ZST~68z0WCP+b+oxRZd%6ffKUfUb8a>MS|9i63e{TbhXnzpIaeigDgVuavhh zk;Z|@VnKekCtx{=fwRuimxCkQH+X?cY>ZzD5YpT*{KqofH50;e=DQ6eYVTCsGYfTI}sE zTX$Qb`nX%GL!45PH|3bfmwuVlVc{k?%^rf4SGUt!V?Lc8`x5loP z=?A5jsZXUs`trO;|Ay)t8I|~2w-YaGAx9g~C#^@O;2U)G8wv!tF7^xB|Z0`sVTi1OI^w?ao{3nj|lkAgSl z#28|aeHs36vUM%YH;(+6wbspYe(jF@NHJ`Hp=6Pns-Sr~^-^e{{`__O6PKYrDoxE_ zt4yzhe5|YJsQx?=Gt;beU!R_CkhyflOq=xLmaUFNIzId8-0j%X3;N%i)X3Wv{EtG<8s5^e)@I?(z{RhZhSug)Jd|kV_@tw} zTyddkKd-5r%ofJB^;qe9Y|=SsJ{NVp41XgRMt!$#Z6!SK&Fdy>L!=CY>L=5zX`xO- zp?o1g^;0(X6ms5ZJe*79*r$b%^RTLLUu+}piHKk5Z7Lk4s7&Rlz63?_DKz&{RmA*V zjz|3noKt@;nA{+$)=9ay@b?|q6o-smD0W7)<8;9vBeiJ$GG?|&-o>1jm5`5y3ewLx z7yKpY&ErkZ&LUB8P=mRWZKgUuK1|fyPogj1Nc!hi>~$C8`<-rW5d~Sc02>v_Kb6nt zVnMSp*ku~%9SNP3;J}SiF1gtOGvSrYvexh}M4L@#eBGjr1+|}tkW()_He*R(nNDwU z_`o$o$XQ-P69cSN#1W4I{PZkD3`~*vQK4N`7`qXCumP1N+EH?Kh3T-Tbza=}_;YeYO;m`fE_6LkwSJ?ge>(^t9dp!s4*%M34! zImfb`kZo4pa3$+qNzQBMaj|PBGb$k*)XnVZ0{hc4ZUx58=bTn^u)8@izfY=a$qN(t zR#K$vjx-5in5rSloa5ni#K*k5UH-7a{6c;%E+xaHPveWsIf8-$E&`k&ErGH=yqo%( zmVU$HnHy++@0=&d*Py^_!w>V_K476A{9c9j^R%+FF|1*SfMI zMNj=6e*uO)=l;?JZW5m^|B2<4mhN@(eV#0`PBTutHUxof4TQ4am1$a@Jo9G)MaJ^& zKQs`^H?1;Apm>I;ZZ1>7^gN?uuxJSs!#bQiSnkJ>=hkQu`Gyk6D!$uJD!qkyCi5h{ zF}JI3i+)ZNOz~8iZRE?8%qv4f>t+_TMB6j?HQ!J(-10!(B05yc#Dztzt0~(4FE}Wd zFah}L3q@k(w3v6@GuBCAU2_WsZiGV6{D^wzT?}eM_hEyuuBd%?~+|NBx=*cjPVTS z>E=7-k{juJAK7w6A-)&Q2S1q;EEXT7uWr%p5q`p*0rDuhJ3t9CPV4b~_j8J)g!g5|%HKx)q?zyWWdZOAW}!!o*Qm!sHnR3*i}fDx|hmUxPI){ zmXacus5Wg#Ig72k5Gz-&b~N@`EO0DCejLdpxsX-|ua0iQ+Zh0)*TMp4tp{4%>;lGQ zaNwBFUm&$k>%XKAKcN{fZ-szu)10)c1{}vgnepY|H>xq%@qRrkqHmKg z_c>H$GmlcX6zi?Tba2fA(sL5Jh7c_Y z<_Zv&OVxuDy|Awz6!ZOR<&Ky?!rG>auAaBKp%{PN8TK{`4DGag0ErZ!$P3-?BkSV}298UYO8>&~M6cEYA;!=ifsOp)ah7)&-%3L~9oZ zo{bmrvjI3n*%ps4?1dR3>s|jO2dWrkgePjM-8Ww9sEw&VMqhe2E}sT@NeB<4(I=&G zfN964WG%zB^Z{#r7&gRnOt0)o62P&wFj-;i{l#~+7+zinOqRakjlTV`w`@N{YpjhC z0yXnG?_`9G3-lJ$`{p>~F3!`E1FN8znk-B}!@FBRi_94xkj>HpcVfx+A?r&wRtd%M zNxcYT=D}SbxyJ?QLjnyg5Dl1*6fPU1c|5aign=(|Rqycfk{HGUtQ6&5d-H}rG29qp zCjs?@`AbeVvJ;duD3H<_DLfb8pR{^+y#!knHo5sasOBUS=^RRTZ$?@+07Y(hHJ8}} z+s8CN=C*IcJS-dS{^`fW5j2~`0T}mc57joF(&{L@+=5kj&sD8_c_*Y$>UOmb{kgH6 z<_}CCy>*mFujk6|JkUUteh#AjndO{}*<3|)M6fsF&V&jkj~DcPeRpx<32f;;{ga|7 zd>(vgEowSPw5o8^U!#3&Mk1KNp5RIQn7bb~`WB`~^{LOaZcHDSLW?vF%e@t=u?T+P z(xZ_F{tIJ!<}SSZ%i;scU6#wP0+F@Y^G^3{ew`}lhN;Z6UFId%%Q$}C_`=0m%e+(X z?cK?t6|BLJAJ5N_k_JKyDqzz$uox1BqbWL`lk>VGInt%gz=&V}tp8P?bT1xjfdUU< zep;CG*Xr8XV&$sZ_TROpu<*`?cUuwzmwWwsV8}ZH5R^GeG!8{*^G3O*R;7FL+)<3q z8&CBevidT{imotUsM;O|{F69c1@C`hl>d9d_P>6rTssQkvZ!eH{M1zUbw=CjK)MH* zi4uK97oUiK=Fwn1h`4XpG@k%IW_}=W~#`*JV zG6#wDywd~P87)Y?fB`75BpA|eUTG`AVl8*o{2`hiAIHL*|Gi0aln4I$M-TFw7`p*) zuS@$xd}gnnQD9B`{Gy&(O?v*rE1t7oPY}Om3>kcA>8F(aHh6{Q44uT^y2O$(SEb`_ zJ>5WLeL-!};u8(ZmT+fE&qo1+!3A-c=rBw|NKi>YLk3vp5*&{wT#R8@1xu^uT~`^KGeg0c!FG`;V?}=Ev6X)+M^C>n*ev_l$oem5=hi}{S!FO#U6+B}9ty5_ zR~&|+USt)i!W+QOVV@1b?&};Vql983_9!&AAv56g$BCFqI}SO5@xq$LofFFi)eM1y z;kZfg$!B~?I?wKs3$?0W9#V^w-R7^@CHehrUrvi5GSAIkMR~d4)WGz=onQZ}^ZXAR zCM{jTJ;deN_!BZfAkFY5E&axXKR%k@@fhec$*lgp4i&Bh2#3c_(HE&&NwprmzWh}^ zhbUjmY0G>|34@o>y^?L?r}q0E8mw0ldnA4l58L)nZF0HV;~T7-A#3)b=`Aqpw-uPn zUwwN<{a(_>k=Vl4)#U1a*JS5EQS)2!uhTs(IfVUrC3d<2pmD1P?a!nZ2fLo6dM#d6Bmv*Qn_$+;D((ZlNeyFqIL8PX3IoqJfy)aZg)K8oCv zi9Am-oZK4oK;>pjkd`B6De$uM+QoR`uJP{AC$*G?={(KO8}D&SVxu)Af6D9z>UhpL zfheee|0VgBG|`XJSVLUEEcWw8bETWJ_HVpqpu%kri@ZBfmGx1^(XWCB6O*xXo=}j- zEvm4Y#>g$K8g%UO1BhZal3s1RJ=ZgK%y#h*ANhfs2?<};6<$67L2b@a?@ss4YWt#? zC2yScpXVhsS|Lc}j89}mjF0(xpY+Y-AMfG#U(41s9G{I%K~LXti|~^?1Cu;dQ`89_ z;2#RO8Py1TM8(d^5=jN|qnfZG;VPNr2U>~8^iM!Z1CQzq`dIu z8CTJLY24n$<*p~}_UMB?gwuY36!aSvu+SFj77@+YniGVW`kU&(J}z3Y3P_}PzwLJT z{&i;CuN~v|YhY+^h(KPPN1449<2LZEys)k0U}jAcUP=N$6CRRM4GDC$^*|Puh;5Vh z_Lgh2@mtQLsY20iZu?uLt;fe6?KWMK|WQzm9O78 z3m=CDF{R|ZfvMNhJTSRsExA)E>D+PJBLb5r)?z%%Idb=kVww)wy4DoI{zh@Q@y)%W zp=d?iE@~s^i601#g#)C+(gt zw=>I$VKg0@`01X0U8P+nUb`bIMJ29yEC@DGuT7}w6BX2XtZx|FBxo;YZ%)u~%>aeE z3;DZg_+ESsR%GS=%Xlm;9_Qa=Tn3%?zC*K8n%ic9(jIq}_y#{Dv-RN|pd=mPTgkRiG1`b-#?C<~)!IY(+#A1WoM7=CK6n5J#X@!okB&%F zcn~1-E)%wcX~#1dvFWFp1NfS98+3~XXpt{bpidYf;+Sc4=HJwXiIymM(PcMnxwS3p zm>x8ON(xK8eAJusYfRvurM_rKiT}mnZUS37s~hkD<5}s5IOlbC$ji(xpz9PAI#x{1 zp`oF7sv+!OxkcYegFOaZEjh9QfTZ&3TL9ky^gZepeaXHf(rp~F8xtr6Ke`$E1(YFX z26~xwN?24}oHJ@vK$)WwFQGCbIHZR;(uWvFxyv)dpUA5PEL9hx-E}!rfgJb02 z+V8vmfW|kOJ@G&(pu3=@Lp$i^KYWW^nYOwpi*T_DJkCUM)xO8FQa{Rsgp*Urh3NnJ z&fs709`an(mPY5vAvr%!@A1j}n;~%V+~g~!OzoNHx`C=-vJ_D#*uTZSb5(1M;HJ)G ziQ3iU&(Q>x0XV}IK>>N~EFwd5#1v)_5o3~-l+dJ%#(x2TTJJ)=LNwjDOeyzf&o1Uw zcws<{kDd!x#0h_oAa|#I8+6rg;bV!hxBcvmMok}9d~M4dsX{qc9)?}PRv+Dlx}TTF zC7Fy#%(0`JrAfczW9{gu*Nic$noFscH^-3&m_uJIs@(d9NnWzC7}*z$H*sN$41;{o zJgAyo-FVl=seMR@IUpH+Ege&PaSxwtHF@nm}@dKBi zTtMKY_2nxxR1aq(tEv#gCH6>9RMo-p^b5`xr$x8Q))BBFwK>6w2l4W`-5Awqtb<#$ zw@}oeS5o05Pj;1qtfVX}+|9KnYs>UOE(!4V5YOT`he^j=JN5>kcac|X0Flc^(Y8z{ zK8uZqTfj!YG{z+%Xf+~tM;*Z_#njm*#LI%`K(yr%yXiv@Un1Kh(vEc~msH=R8|{=VzGte`c&m)4qE6ZQ)*S(rebfgAnU<8< zE2tjSCb$)h5!)UGFA8$W%TBf%BxR+y3?3d&F^L2$_wlK&os(aU_NCFkSun!H`TOw% zwB-~9HpK$+TKI#4bzTB=XFr}?Y+o&9_pZ(u!5G5m`qxp&5#kb0#23&}0q-3&p&)8~ zZ${G?{k<@^+yYbrC%nAF)PMU$vG!ZIM+!w{N(E5qvF_xMXfY0EC8ihLr?^T@9|7($lkXWuT?( z$E1(P8q&9c1_c-C3gIha5nL?tv)mheswTArM< zrF_E0xQf7SzQFK;a$o^Rs5k4!xepM(U=eO;4l zp%+ZjcxSP;)IgTFKfh;VVbmsgi=C-NuL*@d-KuygnYMqi;R>__7IVhA!p9{XcZytu z0uUg3z0g{%#N<2Vx@EmX=9TN;8`b8w2L}3-j#H(Dp7>BSdhXm`aWw8>%nJX_kiFAA zWN3Y;@gdK1>{l7NR|?OMMyfCJi~2D9BByuG(P2XRB&X~ycd;dx;Qv8YQxW4MeQ zc}BxX$jXr3l(F`l?c2tkx+tgyoh=P5ZQfQHtE1#$mA+7Z^qbm^mogiX1EZ1<_6kAd zL40fXY{N@|9m&jD*^Sv%dh5rb8h0CzWRsvfw^5iCVBIBYBHwSInCM@ z_TE7G)X)js_AHrd0b~2Zze^TW98{#naIYxOd5z#3^StYn*3*@y^kmKDBqOZ2=-A91Yi%kLI-1K8EtG4 z@uT=g1(&?UW96)aFW?`aGDLQ+dvJWY@fB|~D+<)!hvjc{@h7SDF%i%#h7~nDV}Wcr h9J}^k=9xGuVtG5Q9Z*FV{u56?L*b`|M}OdE)bY_6~XdO7S)s0~r7Sx0RLTGywol2KQwl zxq&O`d{=mcySet#)^m}w{Pfn@*2%@z(E$KFQohAkILr&&3bwxD`ut8!^WiI9{x+h{ z+dbTL)pCX}-YI9S*F&$!`AVlU^1BCaNUMyiBN7}Y`gUQ+M)Bsk zeg{lnfN7(W-6JHmRbqN!ToE`x6n|poM0rdtUmyH%)jsanz|G)Z)n4^!A?8~I>|ULA z3mZ*R+KrCETb#?rCVsI)F~wb)L<9~=B3AlTSx5R*+2$ut7`g;XJ}??_3QS1oB1fgl z&BNXiUbhKsa=&S~jA5!~+Yeg1A7%$jcb)yM>8QD%>f$WhyjDsuS)AadTG5qqC<5VF zGkiR!HY406%oCz>{8Ht$_6T8^y`#$yXrt-yT#0aKF6H&x)gQT45^!vOs79HiPpomH)DS~pQ||ycu|mc zB8Is%_34MY8%N4Sse=!fC>WSLB+>fYR>tNIU@8lJRxgXnUfkzSjRh+&VUrtWJ9FH=(T+dJL zArB1;1!)+Ol3csRe<>=e%5#VCJb12Ixh!-~|y|xyrsB^sGCNJYgfSGQ;{7JI&WPS(Y zX(Fq|$7CGCQ(zo$p2WZQ+Kt_TZe|HrvG`+8MG`lfm|6CE#E95*BlupdBh!uxT+;Cn zV~4gHd7->d`Bc0`A!c}fK0G6XB@embIWRErT@tfN&K%jYzFt3oeQ9(b6BC;?vxc?7 zysATi?SH~(P^ag{3a6o}4oLpGdBrgFRewT-Mcoy8scyb&3?ffNH#L9j)_t31*Idg* zYZaQp)>AgC)w#EmhSuwzrdAv8W59@71K`@wA+=&qBCbSP@;9ud=U{Te=j>q0iYR;# z783H@-28!sg+!q#1CYMU75Db4Z>4@Uw$t_3q;9EW_#ApyvH#ZyI`#XyZg{xd zdB&Opl3PI`lN%w}!|Z9u8-STvu*Y=Iz4u=*mNLoB#E+BG*V%BnOu<|qzqe#}pclP! zI6mcFWdqy0Mzo~7YH1jH2uV7%{(M3gc^ORbePaka#*#PYD{^pOxD@VpPvNXfBh2c! z-g@ORuJmeGBC5fQ@zIhb<!MM@JO#vvB4&cJ(0&0X(yw81}C)7%}k9($ai?wq}tp6xDAnjlA7+UJt;iX$fS% z-~;5$(&4{;{SrP;dS?G!mwP27Ysn{KuHPxycbET>Z9Ep%Bw4Hgu0zp@Xjh?A=GRJ0 z8~eK$@sfSB>*+SPZR$|6!M8>PTbjFCCQ(`jaN)--%%wtt%=?nqrk?Zngcl=mT(9!B zJgNlvc}!O!{A+bx(&Oyd?W^mQS3`?gs*(s0bkF6|pTLwP8tgDHnm5+h*OxQ|k=F); zoNTd}i{fIn{Z6mFt>YG1*;rxX=aSJ;kh|oTjbNSUs$4x`LJ}k^AXFeRNTDj2n02C1$b!2K%Gy|sb9K zr&w${q%l;UpE%64Y+a_ZOnT1l5lA{M->kcus$M*|a)IJ>=6iCo@xh*(i27|Y-ovLK z6VkI*#5|UmuF4l6ydXmIZa#Te2^2x4sz!+h^ek=B#=*fkIlVbg#P1O-p&%asb8~kj zU3w)Po7L+-P*_D(A=NgTRi~~;4DA}|r?dY&9hIQuN(qAKgNLc1j%ra>S8k59| zp~!O04RrHW)k2yX&(PJQtHcFcZvPnm!}-XsU!BCUIIAe+Gk)Q*HHfpW^+4|f1g@(w z9#iT1Exwi?T)I{02H9`Gi}}r|`-O5IThiax4TZiwLss(&AVf)zN9O;%$kWx>jB=>se33nZ ziD_fR2ed`A5>awkclIT*ct21WQx+Rf9IgFct0`en0|mMrC!EO5$UlD^*v zZ$wgP>*$E3GBYtnmMwZ4C%8T_sEGaW%IMR8P@>qU+>@0r%s2Mlf`>U7@Jb;rlN{92s0LXud|qC- zp}j%lw!?@4FN$bE|>)M2L>+GyS0#Z}A?337w@xE;3*zEp(H67++ zP=E4V1IXsxyg+uT$&`3mLvE=n)YV7I4ZHSsBAruVi+PZ@y|vs7cBr}zYLX_YeAh$y ztE-CusI06kciT6Zc+*R(Gc~m~xKsDmXj$5 zLEY}U&{}q-)#>-bs^^6eMl*J|oS`Typ7{+OxGr1k$F<*LsU{{S2Lr3Fvn^rfS4#9SAx(pwGr>erC5qz(w^PU0biMPoRGyEX z-UvBp>n6c{JcbQB`5>3A6tR4#>0X9A6#hCzZ_NAiH5y7`Z+GZ5ptU($&)8aJ9wn$j zkGTMwPZE*_b3PdgTYsCjxvh(^v|~>4{4~*Ik55EOltjr7c=A{|ix;ksiCt!I-bMSQHZVQ29 zALz9x{$GzHC?e7*IX!}lngqn~BR6C8@A3~f>LP1T=v+~n(u#h+zcLD|T~=n|n;y(< zxnSDZ6a}otIm79N$mr?m8zKo$yFcczZ4h(vwBkGl9za1cxD@0B&&2mWw`OblWZgJs zh5vkrNoo&1B&BcRes3G~G(P7eVWyj>bIs5E{QSwXw{PF-T$?S9fFvW}x{56Ij=m>1Z^|!4G1**D zT8w80$XLoZe&+Z%-0nvg`2RW`L=vrWpT-y(Y;`r_RAXcYnG<_H?fy%BCrG ziD1iHo~5bLbvECLrRfSrLS6^}Mx4A|*KEYx27EW8(7&@c+B7%AA|A~ddYa(=Uzk=Y z@JG^Gxoc}_Whoz^mfPs)=x+f^7w-2PPDy|78e=26(BgzLdGmkw@ej2hNM>L% zKd&_VFY~nyn^+H*7{+C8c=<4ywNJ9zt~F~sn)8heQpy&NXDpwvb3jTs3BTmle?&#T zqO!vn;PZgy?%jekeP4=tzFT@OAK4t556>?yb_c(1lb$&KG;&kYUEYJ~X5kI;-#-l1 zCE`p--#_oo}yxXS}oV zrVGLwr?U}!#&sF1FJdz{9`ngqZ%p|PvvjBkn16^CL@v(ZoQqVMBrC5;thFBLX3~JB zWH@)*=MwqRA6r)2h^vIYp|dv_jwQvze@6783CiwK)@gAGS(5G!;z(G+S?h{PYUx6% z<lc>;{*|)-S#pkESZ5qj>sQJ+ zU#tikN_)cje9k$xC9PUgufgLu^W85cC(p%)JDt;NR0bG8AueNagIG_|8_|7uqt)SI z{&KdZ*l&-)RHDs0j69#&f%m+DSbWMT}LUfe$k?k?0d1aO>q&9V2Sz^vdxtzsy8_`=44n z5pR2uFQ?t{=cl}OT+*In=QnJ;AJ#YgAWL}f-!S_aXvHp`Ji0syYfU^RaB8Sz8rT8~ za-WqRWbR4IbQ0M#!iHwL)rU9&DcHb<3gKuw`X`90oUQJm__sYX@tJAK?YP4G=P0oQ zs`0ms>y&YQ{HkAGF2`I_)ob5ODUl3<`CdNao4|k2+&E3^etz-m zYNN8Hn|6i)gK!R3dpn_I_AVdjU~T~y8=I`b_qg$ckm0)<8=_K9EDSnE33s{QC{5Je z|J|QU*tB%@lJK;yeBENwol;7zK_?CaCBK1Xpp+Z7nZ?BWr zvdpc=+ys7;W%iDE`6hnqQWcaVBN}dFf#U88TN#7(PAk0yBDB77N8PJS+vnyaJkpu1 zQ#KWe0RvXbe4?nyvk$zz>Ta3kB-fWgYu1e%Y}N<5U%jpG4?nxV%@q8$&c5So-I~Ve z`0WM7rEHs@5Pks)Pq{D)q_(nh!KvH2Aqn`?jcxkKYpUAi&7rL|kG78x2?VcE9aaM} z$4@F#*wweOg>!}KV+bUm|2Mlep$_@~#f<-e%}_9fIJ;*OHPzi6XQ;UbmqjM4hMsol z_(a*!8iGJhK|!IBSw+l#R`4Z%?^|s+ztpCWtuem;Dt>rKsGJJI0%+|Sb#C+=iKb98 zZYIa&4bcr=sp21$q}OKBC3l?{3)hOGqN5+!>IW!n^uau>VeUYK^d<_emC!}R*@6)D zX6atvDc#fp=r$}aKYn;#(yNzaOUm%=aPJAPdhE@-@_g!hlW8^?OXT8TQnzh)Bn(>~eJl}&lL3N^q?<%rc!0&dx6!mIU(%$!w!a_t_lzPY zDaYTRY=jN9h%9<^IMn^>0D<@1ljlQ){Wo-Jx=dY0+Z!hg*$}EjixZWeUh66pwhwBb zOk#Ewe2~T?Z%;N<|7j`f%!BivkknNlKSU7-I3d4{XLcQEw;26nj(a$Oh}5l2@}98W z_-TTJ3p}gDs>-FzKY?dl%f!iKcN+w#sHh0M>%Ie=ZP4XIR#01dE{Jmw7+v1;m2yuh zcNO2|RCTfn{V1G1q_=8fdr9P0I&=SToYWW-_Vq+?<0Y{%lF?o$Ifs;rgG?*Hxu<3^ z*qELuv~_zcy$X^1%sSGXeLJ!21nVt@A7|=g*D|>ayEDr{z1G#m_UJJsa%~Cx;c7YaJ_}asYm~iwGkj7pgIE!XFA5+9%yDdfQ9*}4fj;1eLRy*IoS3~-?cRncM&@w5K;iMSyZ^pCT`uqD z9wS`gCT3t%?fQz)Vr%JOlaYeGSa@=3Wh8>;C}AsW&(s834m^vrvDtE_zb55$@dxNfil_XF&BBF%r=P zMGt|ORgUXtm-4LX3!fmgah#2T=||u?cpdi&1$&ZzaK|#W%l_9=tG6wGk^Y9q9NvWanCcNLVhkWp z%N9v9C$GiZx1-}nP+num5=(gEzv{optbN3zq4{RfR|}Gar$au+buXdX-!9QkKDd*_ zLlZW#DWPM^;mTkM>r~X93vId&Fta&@(!Ebe7#0tS()QA zDK0MMI(0G(=IZbmXM@{!73CO^$@s-(WnDPt@`K2JY2(4Dj}*f_qDJy8*mtlmT#&`$ z&f{M7w|()v4ZcRwNCLL>BD!E~r)9oYGb zd2z~hA$$<5pIBynA4wpvRD^HT=vGpVOV+f!$CM;KVNSSvDx6YY-pqzn&G2->=;y31 z5qEnifp?5(2AbRa)I;djK3yZf4^ySzR##W|$cAPFc_GK0v~Ei+C!?wc@+d)F`KoKs zVKNRwblpOEOCdG}(qe;9oT3_`$sFigBTqU2y>!6fE!1p-o3E8!H9pbqCJ4aEii(XT zC{gr_44Nv^<>y_4#25+W20Yv;;a`nDS`K^!OkYeIjs}WY+L{Cm_Le!@L^!b9G|oIb zne7%HtNx8{?LB`_HC;=Hx2*~FN;_CpS0hs9y;@my9f}VdtRSrE=MgpEJ9S86) ztadRqarNy?c{%Y&HJ^e1R3vpmJ|dc>Nmw1v@F!oIF%ga=2nv?CKBFtA$q*ELS+~@( z$OZ;3Y7!dD+c7fJ3S{eX_8<<_F`% zAxKNFZ?U3?WT{p>$JDQyoU>C;0-+XJB9BUe7B*~i2kr?rAGjm4fK8Nxr=ufQ0!IYy zok?dY!hZXFIxvTSp}w0jV;8^L6>k5`2Nn8`6sRPJ-VW=`oY@4BN&L_IES_7zZdbPBFK{mru9IMNvf0ztt4T$c(G;vB>SfBo_x7+lomj);Fly37Gj>F<` z#|7DaI5zu|O0847vrj|YPgCk><;Ij^vlX9cM86|-S>P5b=5s)?Z$k=L5R=f|-#^X= z#;{aY8o{d8)~KRG6b2CK7`tcW2NKK9n8c7Zp}re_fn@~x`lVZ4U9uhNOq@Qpk8W(G zIg4S(kJ?0km}3;Rax*qp<#$I+iE-JCTzaXokQ#@fXPYM{7gt-<16iQe0BUk;@b2AZ zp$Y;(ura0OWQd^LHW~5lNYvL%uJL@PdY^G0(U(hb@aBgdt?=_k^a+Z4VGxYI^iIrQ z8S>p?Ca!PkP#iuv^c_Q**2MZ6jG+}_n|du@ZLYkhwagYkHuL%+7F@XQ#>)#Bp`AL~ ze(%%g^Qr&7Icfb3qAhc!qdOTDmSZAnsNAw*S&kP}(H@y>b4!$C{kk%H`P^67z1~A^ z;A1aM7mo3R=}e73a6J`IK)QUCYnI1BGPInBNB!gT9VMt<`s?h6{BGi4T>Sv@33)50 z$oWnwPdbs(I>+xw#;`aJ?AOA=$9c$(j*cg8c5`)q3X(v8H(c_-1!G^eX`9xvziXd= zso9+VPZK7u?H_K3RSv1h0j*65T;~WXHid8*qm-*=w3wI}r?g2c1oY1UMna6JQ@btU zp|}VDWj&X83&slELB7QCm#0CL6exoKOYFHs`eNT}e`kXdh!YXUL6FfROKO^Ltgffr zCO(;!BPi;6L9SNiwoT$^_jny`E9^M*`K^Twphb%DFRfIpve+l`A#7@)E##)OQx=#e z{jZVXf3YSE>*(_Cb028rBmqLE7AoS;L6ppF_w#zN6OuPJVUY~xnnqW~>mMNOQzpC_ zyWiu$Vs_5quT4gJ!0fzcAHu5J#DFKxg=b73eHgWKIUCNPqHOZ$=Nuum{j)>N%-9}W z-N2)64uu)qZt-Q=bhn}M&@4wa_AB(c)-E-E&&zD9*OVCps^RM&5<_sMhOq$yT)azZ zF(Sx~m*yo%JQf_-!r|aKJ4_F40fp@|$A7_90Py+}43yI>;zm+Zhd?J_;@(Yr754no z3vR~}#aNc|*j94>O5&1@W8@n`?U4qUkGpL6DuwqLq?TZ|ZQVT1)MQHiTHA73mk z3D>(-p1^Y?FrYT2Ii~PN4w03HZB;;Eb?4+~U-9mp@doMl#_hwxzMfwEd-HPy?&=Qs zz}~#Xxuf!@V%kS9=a`C>;cV7d@O9gNVEd)Ka+vOF!z=^v`!*jV(m3K^ea8!iVbIiK z2S}8aaqInVd6Xda_I&FrJKw+JdLs!h+}O1)-#DUDGBUc6;>q+r z^7A92WG#~m7CQH(XT;2m_k%#Dz95~g8xNYcY=PELs5?Gz7KiWX$Q*ICIiK~W+8DaJ z%AV-6RcF&Qd=C(~8Z>a(g^*u`9sCOIs_8o)$D#Om;^)gS!VQWv$;+ziSvSII2|+^j z>#4x+rK+;;3k6-mg&J9ebVeHpH_~}+R~FpBTh~>2JBV}lel^u4oRiEeHdf-V_Y0CO zd*9rAAKX#Y)sp#gc{E0IeajFWcXXMr(u6E~K+e;1G!g4VCHO_}r zGWSy5y?giTP9-Q$ouJu^devoLXZm8s=HYxya721UuvjSxxbxYtMYg8NM8U=um|*!9 zz+xqHTNvUM$cIYPbaoj}uMue<`$U-NiIEIu%|6}TVc43%*hPZ#n0$SILN*B0YOhRA zyIbyq32s*Om7<#lbhZ6N$S@;UoU`VTzU@iGRK}W1YJ(Q)N@=i6J*I2hiyA!;9MYaQIH+ zQnS%#uML7pN~1d2c!g6RF>3y~{(C<+0gmO$Pw z>A;a4v2LFU&Zvd#uja970u&@q@v;;nY*J~#4BN8>6vtVOtHaR(aW0psg(#dw*#hOC z96|l?DjJ;FI75f_Vp}1geK<#pO|3q>C35extYZ6cRSSKq$ppgZThrQ4se+;@+e&?E zM*5M><>0D7MuQEB?`hxPk9w_hJbMq$Q)9yGy$^$5QFSW%d!Ox@pZhF1Oul8*Xg7>A5tK+SBrow$$uKmr?-w{{G|`MEXmIK5rpq`2z{<-#Ps@IBW6{P>{SmCS-aU=cbk??V^R>Wm00xbTJ&oKpZr^0oq2ns^U@F4lQVyjUXgcH1Hh6(1Z=<1i*D)nNW)xL9Y6r z;L=nE*C8-&2q`?G@Aagk+2$w`DU!1l)+Oc+ttB4oyf`K~LZ&DsI-1@BwqXynh{Q5F{CA77Ra;G!$VBnLIlN2U&{<2a6$m6gI`I%F!>K%7`ykrVnSO zZ@VIifISqVehgJN@O{dQnfGhj;f|-1zsuk~WAl?G@Es%$mB@mm#t(cZOU4euy+@Gp zm&M@seg6ai?#HbZYzi!Ve1rQw&d$!SAx#;w+?^2C(ZEc69`Wd~Osby-B{z{i+QuDX z+UZhZ4Z)vYY-%lQYWw|M+W1hz)X%}X;A!M%;M4vD8Pd(!Bq06|R^BJOy%XZ7`r!`4 zs8%enZND^0(wcWJ@G96^d|u8&{>i4#;e#TV z=ZB9?O}@wsah!535^w)e_Nc7Bk6Ydf^ZhVQoCxJ_HOMyfEB(gul~hKzI)pe51qC-! z1el=w(N_t`vC*RAkuqpR^~s;f9oF^OhNfBKX|4~nqc{1?R)&iV9QnJ3Y<%w6T&vi; z!)#p8>wPtL`}tIgk8VvF&ctrFzGTYBICmIJ6HKHH^-i8saT=Q!DkB?aR*~676CJl& z4#Yx4mb#a~Koh#XL=Or3=79<_Jf6FYz2}5_q7i*@c_Iq5mI{e@)r6aZwfql<;>_*h z9v4wZHA$20-Bf?UhOjSFNv}R~h(rIGDnSM}VRIj#WEXv_PT%k=V6IJ}D{qSFpO69N zR=+r#AbTWapFlT^FgSs=2PQ`fy#z8Y>k&%E*WY?S(1?04gujT?%}7w~swFw?r;Roe zhA~P62(c;b7(f*^@*JM7Ts^Y{{GhrZxn2Uz-D)9j)}!g08+ui&nXca<%+5na__)Xy zg0s?k-!nlRQRRPSt=_>#55osc($BsZa&L$4b1IpDfQImZ`-*1Hr6!}J?)c@{pYkW^ zhbweHpb)k7ZCHAi8I)AL9$A9%WS7 zNr_0=`<~a%c$Ef@+&A@0ZKk`yFgKF6#>wv*+q3aCY93h#q)Kg{(4oXOIe44y;kdhK z+)6E+1^#5f`=cWRuLKP%DYO9h+T5zQM0;aJTvH=RCai>$*>PK0(-f99$mYi~)*x{y z5r2E6z3MiJ-ve>0z7rlM-76M(F7R@1n9SjD)Fdqd%aMX#L2~gBGLATVGIl`96{ljb z=GT#bSIULfb<%nyQ+`wsDfNe^zYncbr}oA*sW1XKUFX4)_~AAxiRjs*R0hA{7^+`# z%^+a9a-h*NoYBQnpRvYfgw=L%-q-v}qGkK2vS|Q&?dR`Nx+mzM^YQ0j5%Yv@@nv0u zPB~@m{_%(0Db2v_0Szf3++!7S<_`5g-JQBuYcix0SCCd#4@5vI8Il}ND1@?*cxzaU zACgvvLLo@uY2`(AKaP7)0Fy@a^7B0I#Ia-^F5oO=4TKx#aeT9GPH#gr6Eg8n@+e;? zk0d`VC^CKGiNFje=6Cy{ulxE=*L`aJzpMXQ3mU;?&S)jb|8SxJB*!kBG+>pb>reQb z;@_W{`j1TcKXF2IW|UM^>^Sa(zL`l5<3~g%gS*esft9tEn|IvmF|D;L5cEE?v;7@T z&trzT$J8T>ZgTj=VMvYr&kBHJCIz%v9!# z=4e!X#69S72zvI~R5$ENbemTxe)N={AGBW|g_~rLMa8ye0K&@A!Gx)BaMHrO_r~6A zO`o7OzDQsX*okUdT`b-d3YBI`6qzbV6qOZqY9+fT1&>1>n=gh1o5&`0Yw^f{<8bp> z@aQ-Vwm%a;K*oxABWroBQPHLvO{8`wVpf@31Tr`oWUt~b`=wiq8{Lx9yzGm(;x`nb z3L_*=IL*^kQ3-vsyGo0?_8sXehZrivF$2^zG&M{+-_B7x&E#_Lk39(MahkT1WS!PF zm?}|Y#GF1jl$sbOy>WfJr_QoMPfa1t^pdqo+fXO+vLW6FT4ryF8-bP}K4dk7qa1qe z)xmV4umxHYnIDF*9APbN@yQcCmOi5fd8Ev~ip}?xQUKO0M*US-}4RUd1WM diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 8007d13db89e..eb05927b5f18 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -32952,8 +32952,7 @@ eftpos_name = "Cargo Bay EFTPOS scanner"; pixel_x = -10 }, -/obj/item/tool/stamp{ - name = "Requisition Officer's stamp"; +/obj/item/tool/stamp/ro{ pixel_x = -8; pixel_y = 10 }, @@ -63207,7 +63206,7 @@ "rBx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/stamp/ro{ - name = "spare requisitions officer's rubber stamp"; + name = "spare quartermaster's rubber stamp"; pixel_x = -7; pixel_y = 11 },