From 93408c2fb8f53f023772a4fcfe1ae339478cb721 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Sep 2023 21:55:24 +0100 Subject: [PATCH 1/6] cmb/wy stamps --- code/game/machinery/fax_machine.dm | 4 ++-- code/game/objects/items/tools/misc_tools.dm | 8 ++++---- 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 -> 10960 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 5 ++--- 8 files changed, 16 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..c977fb25457e 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -420,12 +420,12 @@ 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/ro - name = "requisitions officer's rubber stamp" + name = "quatermaster'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..482ca5c69d3624d537c27768a573c62bf642ffdd 100644 GIT binary patch literal 10960 zcmb_?cT|(jx9%H?G^KY@kS-ks>AeezAiYH?(xi6?0TmQPK)Q6KOGiX{K#G(A0V$Cp z9fBYR5?Ua@4d3tFb;93I>9c3gp1q%W-idwmQ0E#YJ0$=B*YtEXjR63p zO89Y+Um=wAIacff01+tE#KK?G$CbJ8;EJ?AB^zIHyn9pz|X%=^$> z{2OWCwLxLlFPhfsj(P=a&CpY7u^J>$Juq@b`TnFhMkc({&MqQnaq9QZJe1ps<<-{I zkyoNegWTh)ttmg`J?3A};d{wcj3ynenT0aC#2;H+udfPL+9@@TXx1(5;hAony|oF{ zL9c!V2pc>=k)=G%Uqo|{+@3%6c@(z6m zl8QL!tvAPmx(76Qto8!Bx*8bTt+zLxi`5mAy-JBG6YQ4erSmF!hx|M-`@yNKdT|Rp zbKLAxyA{;SJu&g*XC{cW9Zuzqu}nU&sCd#Pik%g4x3_^zlen^mzxys}ux&-gLTPX? zG}Z1;^ZX|_n_9TUJKWo}8dx#ej&9gfg?{e2Rp;EV^^sep)+p zkj#ATIud|k_e4KUeD>BJuc-JBr@uc^YHcmsC><4>_pL9O+oo2Q9j)B`m39P zQZcxkVwOP!!mztc=wVyg9b8;@-?KrH7n z{fiaIqZIj$+&QqAdL$;VqAv>oxBxv(HIv|+onK)#CIQ`7cAeEnsA9NF3k1i6W>-pf zrvmQg7&nN58-Gkz2_nfoB!f%?@45xWg$C`E)_-DZ`4nQk^UPD&YlhmY_253Yy|2+) zq0QA6eYcg63s&mUt9N^HmTjJGC@v!U5nXbtA=JaeJ!qR}3Ev#=yok|FteFTUjfwfv zO~lLn%N|6ZNZ(KY8G3IsB-@hW#*#$%}n(^#=kP9G6*6h_VE4ZCF$!j?8UVS z4u)b6lT$A?W=%hDbmDs%k}>A(2kBL~PCX03+ZSHj6A&TrHY#6W4g7nYCRfZvz9T=F zlMi!N)K(~oDx5ftJu>2sc!I2v^&1a?1#_BXZN*f94+_s&VIsmkH$Hw0M8#n*laGCT zUe0$$fzG}ceZ0*A`t@ceSA5jnWvDMDE`_8;fA`j^DaT+7xKv+5-$_g3j55ry{6y1=HN3MPRs#!OAbJ6EJG+~DD<0}%tkOzd=10b zq#}BE*<|xN^^@>#lb&vF1pRP@_6xF5#DpF4}-c0iTw4ulQRf( z-Q2dDpwZ=Kz4~CqI`0xf>Dhsju4N;2is$uM^k>84=TML8A{A9tHMJK#bT8R)UM6O4 zSrHQ0+N_PBxnS1a?GnrL@1_|`DCEexQ;TUNP#3&s-`m>@0C(=*tq3S#MlY~0Pq zWv#W@MC!!Fy||?T0G5`PF^P#@e))2b%UT=hYh=&QnwsI{Ww@XPWutn0#K!tlrW5&* z{^nb6*HLSE&(CI`D*xS^!58)QNoZ@zj&Mr3yf4JM8Obj#Bj`_nMC#N1=eH2f;(L8F3FSgp|BfC@hI*Y7vf;ni_?pVjX( zxpsDTqmT`K?$eM+{gZ>93@0aF@oA^dcQ_^XtW-JjmAB2s+djN=xKEV#??1FE{;5Xp zHNYwB&6UNZNIRa#cXr~Mbpijd=$>`qFwgn`yP8~+k&0mW_Wv$E>r`>x)w=sAIn!j@Ji_cXC^^m=#yaxR1Qky=^c7h2Jxpx-WubBQ@Zm4jw*Ucxg2$f_} z(Z!`L)8%*CMa43&vJLnx7s&?xF%(}E!B8|cVXw*5V*al_DvnfFv$gMkbY=hE%y+xB zt5_vbCAd=})S_AcXkUZAo#@g#y8NAHgQ}db?L$|>r=QPnHW)^UAwjWmt5%(c zwrxf%IFuW^#9x@eBU4kSAgH&u1Pr$;YC5gu-WOOSCmFo^WcY)m#_?K;A>^3EK3(QSChYhZxrG-sg2}f&ozOJOm#3FF)MsekU+W(|O9ChIn!hNzBoboG#sSMWt ztMi?ihwbG4_v>D)y+%)bd?YP=VQR*p1kMOyJpLZfojX7N;=8-m-x2bWM~)WK2xhv{ zos9x!oXkG8D*hcsGo*ygRvy>bapT@i;E~y{@{`t2FS46p{ng=-jg5`esFErxly_8l zdMtwgB^w*tXJt#yOqr$t&ar{bj|3-C6JQtcz;+wIbrSjqhjRYh`RL0iVn|fo<$Wjo zh!1nclas`gU*|nPrqFdhfLJkW7f+J$ZUIEarE=2JqK}V{?;Wub9Dt(x`f|cr z`pP+}aCPamIF7v-*Dwai*#k-ooQes}LjxBVIlawn1XoR@8zfWzUx zEOU^VK}R=QN1Sm86IIzQW-=t=?wIO$)e37gvwmm5{oBzpXIHG-y> zpd@)z!Tjk4&^Og_9 z@ud71&ey8Rb@)kSSww_}9Tc|Qb3@^gk)7v(p@_=f_Wr(q#=>WTH)Id^d(2OdG%AU? zCRqO7n`H8O)3#2g%K^G6zb~DYoqglx9~V#0?;kb5ZEa$94x39as*6OWwQciK5p)Ij z3SUz*QJa}85!M`t;#3Z0bkL6P{$Nz}J}<9kOZQPchmO24G_sdyK8Wi&Kud3bVN1>; zEL4Y9z4uZf;Iq8Pcb5IlgqexXR)fLF6~sGOOY2tu?6Q17ncq zNq-p-+2D+jZ%?#<@W)@=5xjNeA6u&Pv~f5C^OqXN5Y-+HC*6#T=I@Ix6S;sC0oJme|Q_i_USF*;zoaVC9H-!HyD{23EDibV>Zd z>{tH{`~17Z_-`T7zc*Vc`$n6Dw1PoGvh{&>%#g5H1UEeaMYX@|_)NvA$O;01c8`v9 zo;=|?EG^Tw;wK0dqnOpP;+|Mpq?!Q4mfP0Yc!((~wjXSlmkU~|dr7Wkf=(&Up-e!ee#v@p@S3U~+zFJ7{LnlM9tdt6 ze-a`*3J-2HLL#e-;&!5EJfLi@F2kFB32u@a2{LmnC3%-l)y7J*%6MfD@- zt_7(QNA|0-FWpOmNT#DLOiXygo}D=@m2z<{W3=aSW1PD)O}Vr`h&PeGEq@}#x^VfP zs>FZ5vI}%gl#fJI;Ajw*{81eJWNYwI4OD#sugH{-KP<4tH=}LbZYZ-JBKgaPY3@$bE10mOzx2J4Qxm9|f6yr{iofS5(JMHj*=|TMQu|M+y z;!LLE`WByPlZIC`1H2CN$I>Fbz^WH-_!W9Z^j`wCrNf*oj!YQ82>v70oy@D5z!yQa zy`u;$XP`zr{TC6Lz3o^yJ{q1OPG$9uFWNuw15ixbRdmP{}`&*G)q zO_F*JTr6MtGuZlop~yFaKqXfHN(wT8Nz!>#>Pe=K&*p?%ZyS<*f-?T}T@y%Osx)G2 zl_UQ!eP^X%p2N&|p~Vg2yK)_3$@qE>DoJT1qrIGfZyC5AxH)(cN~a92flg7uz87;NkDzzq<)uA zw#Nq&hUm%dSr3$Q7cK%s)i2gxR-0u5759Fla`i=@&e|#7T04VyXvq7X6eHmeC^&G3 zTLYh2mi!P^s+yY3Q~sR~bH@g28N_T`1Gh%j^GOuzH)XcMS&8Bj2acq(46Z~J8PQTb zY;VL{#bOw8g+$aBVc(AX^7IBWPp=g=B@%~{5dV7Vy;9@BdJesMKdZHHZqu4iGy_e_ z&z&J?^t?vs_HF6K1PIMH)F?>lrO%UY=J~@ZNREhXtOL(t&jYf&-g;OpU~FS2rb6?c z;8&CL$p$V#;fhw$|0mp-jE@}~)YFe1*p+yLrHZ>x$9D5|ccF1{mDNZh{D_XA=N+iv zIw1x#bqFS!;qvx#j*0{JNRz1~?kHXz)QbavGJSaUhE`NGm(!FyuYjmJ0p?(;ZiT$d zfF36Iga{kfXoiNi7C2J4rHLz}c9a%D*Y?cR>ksVKB}oy zR6bJvgg7!enf@xf6nSKT+=-B3@YxJ=?(x}bqKYTM&nP6{ZUJtbB~OWTQaETAVj$8d z2Nd1rZyM^KsO1!xQOs;0YR-+OAl3xf_f-9PmFN9OA}!N%1@1+vN@FJn&b9cB;mjgS zirEeQvkT8eps!Oo9b9?9MRG{pd%PzZbCsqCA9B~o!lc5D!g7PSi!u$XW&iv4ClZy~ zbB>-j*NB0ffsww{g4@UKCw@Q|Az@XMC8W4~AV9BQR>W8A1bfb-S`wR`tHFJR`(n*? za%ysU?4tqDMHp3**S?^TuQ&iEI`?Bj0|yf23mU~AbQRROPxyB~rk0vbPhegb(1E_u ziFCUe-ReB#(d_yYVWne7*jpe{bWZvEupR^#6>Lw-{!9ps@5;>6#MWv72LAn z+fwU^xdB5*wBT-ZY3Z~p>>(VP&qsiRz8mm6L?+vUsj^!q!3fj`IS)$io}S_LyI%aj z6Rj18w+Y=_Zdl-mJ!Q}_qhju**tQF&jtsebysDI6w6xDwc`BH; z_&%9iG3_KM2A5XrMIyAdTXuH{6&6*Lm%>SUmYTtU5px{QH$*XTCrBCDB z9%HMW@;>}qJ$Tg@#LS##5C58I3(F6VN*$OB>GoS>nEuAXX272^y{)QQOabMV`hNwA z{}E5pE1v#o=q3=6!e1f`xe1pfTLw+4>oT55Y<@7lSxZ<79GsYJlWR2%`JA%s0VU9=*?Mg_Y*h~lp! z*+$kPrvg+5S`^9*>|q(Guo3dH$HB%Fqd07b*(pyDevii#`2dY8qry(TbAS=yJeihe z8{MP(;#jWFW@`^+Vo_nFb1dy0uCToP&WKL{py6PCJ#|!uJzjnIL%m0-xOE;cpt`Z_ z_0)J*{a`pl1?&r|v28PpNl5rAq!>1lx_f{GTZdoFy4T)jS|8`=7`vRaPru6!cHEJL z6Q5UR1)gyDTm>FoS&E(`6SnJKd4~Mm4Pnd?>hoZLzK9w42n>s>mPmpZAcLgM1XAgh z(=tfa-(Skt*SBDweC+FP=;5DFjyXE?;HB3uHJ3YT9cYg>i>?4aj~Bwai<+JZ*}Xg* zs`b^4cjI$u`GY^xj~=7j_>DWwpuAj4V6Tt@edGKec3%gJY}fk^uy&lM2a$C;7hpPM zI5J_|9{Z82-buyc-PVl#_|No$A1#+Xzti>8$`eW4xGPiO(<@ohoBHzctesZ| z4zq#fieU-cpEhU%SAP4tKRJI<#wUFb`=QnjHbPBHw7Ym5GM@mJ3)#2ZA6 zuZt@VPm%U(0_^Nm`vooLgwU-J16^QwC7ZJ8r1RHs!sy=5cz zl~P`OzuJe1?va#jh$!g65j!BbG`>wZMt@-a^ZVD_GTv2M`u)kob%Nm*Up%pdekD_z z{K?3VI&Gd*CSTc%jQR18_Aiy7?#@pEJem&6zZG#|ygU=ZA{;0`%!A$dYF(B6)x-Rc zvoj2jOQxb-a+SzaRU{kz93#?+)PT*FeS44gsRRc7%54?%Qfm)l$JWmNA(J8E68}HW z$bX`x|G9ImA4ZR(5c%T!G;EP?F%3UIJH>6W6g^eOX4cxmYQ5V4(9-DblseZ5{+8)z z+^{o@#4rH;w#;H(3%J&WCrcW&R~aQ1?J-R6$G%v1yYyf=LUZGaY^&ecL`JMc7-q#;?Z5g zaj~L4eKXHG{VeOp2LxopJtLyDO1)7etks5$S1h4HK|Ekbdk~&t6G<45@6AB$<%*!B z1SZHmk0+VxQT)?;*h~ZjF?=MQOt~9Gb7118WWzm4od4V#GU@*PWy8Sn!*38ZRke*y zj!{l}tgxe_qhJQ7A8Tf&mqHFF14H6fDWUWWd`7lU@Wrh+*#6!GbCK%+btkFgGx
t>dK6RM5M~c2jXZ?>7vN`f{f9M^pk$Hu<+o6V3YxSXXW_ z61vnWZy9wi`2)@3uQ7FpO}#dkgkY_a?c+D8rrR8&DQ^iRp%?`&K3uhx;rCDh9y3WyqrBqW zB_kFLG^3)I{9Rk%7c$%;y~}T0LiLqz_iW#LA#ie?)1&2V;TxoFB5fdl(+grdDB_G` z9XyC4C2N`Wh3n)3KK@wNC4PmVg>uNnz=V}`)h*}fTuznzgf%-P88xJH$N zg6}ljDw{8&PQ~%zx)xXpIp4lB4`O!#3eL>d<%^}n$s6Y%q(4!}XxV@wml0(nwr+N0 zozn+N+o+~taQZYu+hIU|mEHp&()M)YT*)T^XT0=D0naqpWE7CN~$ML_Hjh;e7hOULEO*egR3hnX&{u{>l~hsvFG2{%#{!O ztH?H%CVGl?2dy~^x4Hq6BUviIV&O;`=vpvdI=g|nz}rLdg?%5w7bT_awn%{w;b76$ zz}84&t)r*7iJ|qjEq~V#c*@w3&dU{YLyj{`sD~WUA12mF6!fUPaQg=Vf?Z{E7!}ji zqe~T2+jG_@Z0!~b5`1W4dNX2fc=C&_CrV$atEx(bL)KdrLkTbWQp||MZO~|O(AmZA zT-+p4dH#Lhr^UsM2=8{U$jgty({7$6`|Dsn*vRO`!04&Zp~zT6*salNyTo{Kg7*B4 zPd|^>U093acKzDP`Lu=BO_7awJPODm1~d<0!u%sqfBx78-SF`_kI}X>Q1-Nwoj45jNucru@O8an6 z8;38Y+HlW@=FM;#8VL8`DZr~kPJ-#^o!-ZfDC6$Wbv9_O3=pekC&jSi3SDpCe*I<5 zarv}Dh_@PCdkj{ApXC5mhtU;Ac*3o$3VLKu*P4P}PenZ@WxF?fPc|P_}Rm15N*^bQo1{`GB|84 zK-O1^T83?$LZl~r8p}uIdzQg_?)}Dg;n)17Vvi_CQQVO#pwrO`Nj2mj% zCR~X7WH1}8M^J6O(_DY@MWPLlL^W0^dVK&9$XRa1quLcp^4AkKSN2U)TH7-GBIE$| z;pOeWVh=w@iuJiPEBCT!*-H8b^LYL~Wrw;^t0Kg-%3E3E zm2DGO2LmuD>%0qOaElDTW`@1yn8M~C{j}y_il;W)Zv68S00Z zQcR;{-r{bs;bP~-x)d)IQ&Ur)j1{N>PsCKxE(T)xSjS3O$%Kso-P3ImIrNE}!Sx_e z?pZeo$UPe-T;x&#fE;@H7T{Dl)L*P07pG!=N8WF`n1Ag;f}(40+Gg+TvM=jU7C&&z zDgb3AQ+iI668JokhRUA#f^K`8#0A(2z2+8A9L@4}ujFaS-DA*YLJ$ zreu}>JFYu8SxV~QfV!h4y*4a5OD+*dxzQGSGejQ&>YI}n(sjC^WN_X=Ikh(%$g^ybV<F%eZv@C%TVch#3Ggg^gG!y!omW~fFIUT!dO{CBT4{tXsuCF$D!!&7F&OTY+A63&s;d+551lS{eZ8Sw__dJ32jcWj2d~ zqz5_o$J?r#+{Q6`5oc)%_0O7dvvuyT6T7zs5(*`b>JaN_J3syHzobFDDny!5zh0)A zE)KLm!z{Z>*lqlShFJ9bKa)=lBYEnd=gIpp68ai9;=c?T&Nz0_poRb-+>2Zb!=t|a zMH;TLJ1M+w(V$oykQK~nh%y6}mhPz6b^(ftVHHy`syU@nbNDyThJ6gb4T*q-tdr6e zTmtl&w6@w;9tlZv(NC^zK>3kHSjENprY+;f&F>MFvRkGKi@s~lVh!)p(NXs%rbTG# zGx@(*z83JU1o~KR7L3HGZbQN{-8_h9;bwjl6PO^c%<2t!mj~ORNM;e8u&+h!sSmEa z;ZeU7=PgZWZCB(p8RsK3#S^q%+4lj&Jr$p2kz#_FE8UhAJ7j)RL?)GyicXvb>0i!? zt4QJFc{_rJ^OKD-+^N~)E{ueW=yRRaOXi2uKMd#QNo2iYojzs+yfPVP{$#0`aHzIb zf(LfU05`oE$G@3tI#JUpBenspUpNdqj1yooQQUbt^8d`$O}eF zBX{_d>Ax)esmq99>=HCZzWlPH&xg__AZ6|z6(ZpI%*Mi<@6^p-s}k<(>e6lupUDJ1 z@9gM-f99Pde>5Tx-60|^^I~Vcvi`2k7WgR`e#B@+157T(3W%Y9LKUWK!Q$JYdSa^8 zV3N>Lh z>XcoNbn}6@Iv9=&P2qK#a(g9=ris5wgB@J#Y_>69aNe%O!D3jn1qh6_&I-eS{Uj@n zGv#vz@hl~1mHfTDrbwsPx%hQLtKid} zCex14Uq4FpqlAl|t)|zn?k#hc6~Stl9lG&THl!GP5mn#p4$NKl_?Lr@#w8?uBMbBG ziYB?WecfxtJW-dKuPEPT8Uo82^y)cg>Tx@nn$Xt3oUYC9_yUQwnwGXm`sD~pEI^RASC(fXn z!j3$9{JcD+H3?0)^?16XqDY>u-$+TdV#&Y|Zg>H?i|E6Jtaa-jg?ON#uCDw*x3(E! zxD&v&xQro}xOGeISmWXm#3Ima@W3bQVkJ)89$91CI)aEF(L!UOS!>pJG7YYX4v7== zG-;MbShiFCVz#vS)-L2MK* Xl{yv^NlSRC3g~G))T~i|^74NHXNQ|& literal 10808 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 diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 8007d13db89e..63a99c869961 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 quatermaster's rubber stamp"; pixel_x = -7; pixel_y = 11 }, From 5f8b3808f588406531ed4a9bfa2af90ca4a9d1a8 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Sep 2023 22:00:26 +0100 Subject: [PATCH 2/6] quatermaster? --- code/game/objects/items/tools/misc_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index c977fb25457e..87d7e0ff70cc 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -425,7 +425,7 @@ icon_state = "stamp-weyyu" /obj/item/tool/stamp/ro - name = "quatermaster's rubber stamp" + name = "quartermaster's rubber stamp" icon_state = "stamp-ro" /obj/item/tool/carpenters_hammer //doesn't do anything, yet From 1f1ea3c9b5a79833c3944f2fecf3fb49c3d3deff Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Sep 2023 22:01:04 +0100 Subject: [PATCH 3/6] smh didn't save it --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 63a99c869961..eb05927b5f18 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -63206,7 +63206,7 @@ "rBx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/stamp/ro{ - name = "spare quatermaster's rubber stamp"; + name = "spare quartermaster's rubber stamp"; pixel_x = -7; pixel_y = 11 }, From dfc1bb1c4e526a83740aaf0e8b3fbab9446c9dd1 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Sep 2023 22:03:54 +0100 Subject: [PATCH 4/6] oops. Forgot to change the iconstate --- icons/obj/items/paper.dmi | Bin 10960 -> 10963 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index 482ca5c69d3624d537c27768a573c62bf642ffdd..fea477f7708abbc79692226c91f309a44c25dfec 100644 GIT binary patch delta 541 zcmV+&0^fFDZ*Bkpc$}4&y>8tw425U=DTHLq4-%)V zm*NJ+9g-=BY+U)Aa5+`c1a7lZ26 zxBG{-*__3Ei>8;fqX<#@>j3aVaRP0<^qfzVvFjd7G!uYVrfW+GVdc>aoxenl?3 zqxW&+(wlXKyEH#r&~GAGrUmFXks?RLOo%}iB9ronkq9~@NDNs$jOdXbxZq46zd=q#=0-b;S-g7g*Ar!AZnZ6yX|@h__M3YuRaS%(BzgZ}qQi zeB8KK^($hL>3?Z3?96}y-sJ^2`7FtLELAYzmU(TKH8CzeYl1Y4K1SmhruA6|7Ya=E z%GJDd4{X>X89{w8jQJBQU42P++L89cc8*21$48yEvDAxHdnfDM4flN&MXXsb!sZ(5 zHOTe_zCrP=kMF^3_htJc+uN^W)(3(M+VRnU)ag^( z81%5KUUj$KZTBUTx&Gu~7NByYVtcn_6c7h!eP;uY~!W2oc z)wFtX5EERpUPMB%Ja>vzR>s_UGx`;W!uU|!5E>qM{3)=|&AP(eekR1gLOHYf6xUF| fh5rrm*AeRZ^`uTO=k_Pkih+wvn^pd^E&`$`S~wMT delta 538 zcmV+#0_FYFRnS$CB!2;VR9JLGWpiV4X>fFDZ*Bkpc$}4&v2NTj42Ea>DTHK9QY21S zFTn-H4aqAQv_xA%WJ#dpxPJQ%F0R)At;o#=K1$Rt@;7~}US5Bk-__~u+eX}CHWuA%%kh#66jZ&snW8sH1EINT8{;UeUVlBc%|x)^@%$AX{fb<6 zNAKgtr8nyecWHjMpg%;gObgH-B1MjfnGl04L?-1CBN22+kQlOh7||m=a>1u6sJ%;L z1geXEA&2WUp~F0iBrgOiA-D8e-)5pSc6*Rs>vm}RG}-|Ao4 z__%Se>UYE<(|^-o*qH$Zyvqx4@>!DgSgK&aE%VweYhqk{)&yx7eT>F2OzT<)7Ya=E z%GJDd4{X>X89{w8jQNU{uD+xP?MQoJJI5m1<7b_=vDAxHdnfJOP_MY_fHmty*jr=0 z1lhL0_b0yd@hzBbzHD1$8=S=2_@*W(0#V0{ZE|#>K7S2d(E2=ZK|4PBk2-yB8-pHp z)vNBlyYIe4GS{Cx%mP&IQ*7&&teiyjwoCDufbBoqKIAe=iTU6917z*aYtx);PIotLO1IQbNiVP0}JJh=2Kil0T=!^ c$KR^g_YRXfy`9@%E<%9vo~p%~voQjqDCRv1CIA2c From 0de7f673b105c65dc466d3c9f58605754ab4ba08 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Sep 2023 22:20:50 +0100 Subject: [PATCH 5/6] fix --- code/game/objects/items/tools/misc_tools.dm | 8 ++++++++ icons/obj/items/paper.dmi | Bin 10963 -> 10961 bytes 2 files changed, 8 insertions(+) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 87d7e0ff70cc..b5be55eed540 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -424,6 +424,14 @@ 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 = "quartermaster's rubber stamp" icon_state = "stamp-ro" diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index fea477f7708abbc79692226c91f309a44c25dfec..f7631486c91dadb5f9ebd0696efbe99d115dbe36 100644 GIT binary patch delta 539 zcmV+$0_6SERnb+DB!2>WR9JLGWpiV4X>fFDZ*Bkpc$}4&!A|8c3`N)NS46M`Mo?zk z4SHzw7Vry|o48FxnnX@Y>EE;H=naE36MNT6$BA=e-@4c8>G{|BRh?eW?K@I-F{obs z{Bhqln={3#UOjegW6{mF951;*LDj3PDSCr65SpvDF^;n8)qg|VOau!a&)?C}ugGP0 z^geD}db6%@m*!^+`b`AOv;h4kQsju32{Fh*WKte65AX zxtf>mfel+EBd8CCF@IsDt1szJJJMd*&aue$_^8u1mU@wD?_{03;l8h;h&Ag)*j!`1 z2HC#AHz>aK@jaOBzHDD)JDkMZ_^u|Y0#VP4jdFCMK7S8f(E3DhK|4PBk3xNH8-pHp z)vNBdyY0S3GS{Cx%mP&IRBZE>teiyjwoCDuAk@Ek7d-EwSjE+yh0@?+FBo8p#RkJYyq9}bQ3mpIe delta 541 zcmV+&0^fFDZ*Bkpc$}4&y>8tw425U=DTHLq4-%)V zm*NJ+9g-=BY+U)Aa5+`c1a7lZ26 zxBG{-*__3Ei>8;fqX<#@>j3aVaRP0<^qfzVvFjd7G!uYVrfW+GVdc>aoxenl?3 zqxW&+(wlXKyEH#r&~GAGrUmFXks?RLOo%}iB9ronkq9~@NDNs$jOdXbxZq46zd=q#=0-b;S-g7g*Ar!AZnZ6yX|@h__M3YuRaS%(BzgZ}qQi zeB8KK^($hL>3?Z3?96}y-sJ^2`7FtLELAYzmU(TKH8CzeYl1Y4K1SmhruA6|7Ya=E z%GJDd4{X>X89{w8jQJBQU42P++L89cc8*21$48yEvDAxHdnfDM4flN&MXXsb!sZ(5 zHOTe_zCrP=kMF^3_htJc+uN^W)(3(M+VRnU)ag^( z81%5KUUj$KZTBUTx&Gu~7NByYVtcn_6c7h!eP;uY~!W2oc z)wFtX5EERpUPMB%Ja>vzR>s_UGx`;W!uU|!5E>qM{3)=|&AP(eekR1gLOHYf6xUF| fh5rrm*AeRZ^`uTO=k_Pkih+wvn^pd^F9M<{Tv-)& From a83b1c6c6bbcd934c143ca067b05257e443c7324 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Sep 2023 22:22:36 +0100 Subject: [PATCH 6/6] errr. fix for real --- icons/obj/items/paper.dmi | Bin 10961 -> 10761 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index f7631486c91dadb5f9ebd0696efbe99d115dbe36..c39fede23679df75a697fd11e91c542059a6bcf2 100644 GIT binary patch literal 10761 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 a;p+#BCXGdg-o}Nh0vf71D%DEQ!~Pf1T%1<`