From 338ea5620ec9c90f26ad53ff515157a77f4d6bc7 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 1 Dec 2023 21:55:18 +0100 Subject: [PATCH] Blade re-add, minor item naming fixes, more icons for paperwork (#7265) --- .../machinery/casino_prize_dispenser_ch.dm | 2 +- code/modules/paperwork/paper.dm | 8 +++- html/images/pclogo.png | Bin 0 -> 37893 bytes .../living/silicon/robot/sprites/combat.dm | 45 ++++++++++++++++++ modular_chomp/icons/mob/widerobot_ch.dmi | Bin 202420 -> 194823 bytes 5 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 html/images/pclogo.png diff --git a/code/game/machinery/casino_prize_dispenser_ch.dm b/code/game/machinery/casino_prize_dispenser_ch.dm index 456c3e2e9a..d6328cb99c 100644 --- a/code/game/machinery/casino_prize_dispenser_ch.dm +++ b/code/game/machinery/casino_prize_dispenser_ch.dm @@ -218,7 +218,7 @@ CASINO_PRIZE("Genemod: Regenerate", /obj/item/weapon/dnainjector/regenerate, 1, 1000, "implants"), CASINO_PRIZE("Genemod: Remote view", /obj/item/weapon/dnainjector/remoteview, 1, 1000, "implants"), CASINO_PRIZE("Genemod: Sprinter", /obj/item/weapon/dnainjector/runfast, 1, 1000, "implants"), - CASINO_PRIZE("Genemod: Telepathy", /obj/item/weapon/dnainjector/telemut, 1, 1000, "implants"), + CASINO_PRIZE("Genemod: Telekinesis", /obj/item/weapon/dnainjector/telemut, 1, 1000, "implants"), CASINO_PRIZE("Genemod: X-ray", /obj/item/weapon/dnainjector/xraymut, 1, 1000, "implants"), ) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 46d2284f9f..1a3c1e8532 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -376,8 +376,12 @@ t = replacetext(t, "\[/row\]", "") //CHOMPEDIT: nuking closing statements for rows. t = replacetext(t, "\[cell\]", "
") //CHOMPEdit
- t = replacetext(t, "\[sglogo\]", "
") //CHOMPEdit
+ //CHOMPEdit Start
+ t = replacetext(t, "\[logo\]", "
")
+ t = replacetext(t, "\[sglogo\]", "
")
+ t = replacetext(t, "\[trlogo\]", "
")
+ t = replacetext(t, "\[pclogo\]", "
")
+ //CHOMPEdit End
t = "[t]"
else // If it is a crayon, and he still tries to use these, make them empty!
diff --git a/html/images/pclogo.png b/html/images/pclogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b121b5f8a04f6f26609f6a12604c08318f7fdbd8
GIT binary patch
literal 37893
zcmZs@bx<9_w>5fjcXxMpJGcecz#+K1+riy}1}C_O;O=h0-Q6L$JG}hvyWf4^t$Ke<
zPtWYNR`0#1sz<8#M5!vvq976?0ssIMxi3=c|Mn68+2CRSwZJ3!e+FSDZ%vS!y0Is@
zlZ&H;wVgS+o0pS0xjER{0ssK7R(9&99`GjGzfNgsV!=a_2Oe$@ayXzV-%e#+!51gT
zk5=f)QiQdyKhh%f*sXknGd)Fg
z `Nw!9%K%hPWI^UGE0@U=%bIvSe$vc3XCzDFilh`pzk$B&KI3S
z#rOJhnd;&0Z8Arf!S7E0z;l^Y{AF4fr5)Dt_X83BWjl7x#W2~WF-ARK)S>STf5Bri
zG%+n9<6_WYHki{C6%UK4x_s;*>VEkY>->zi>S5kal0&jNHIx6sBGaa^^80YT>jd|+
zSnLH7X4q1HJo}4Y4qLK?JB;e;d45ChmYice&+S@V>^UtL=79slDyJ;{uaFj4dq2hb
z?%z~%?@qiRfd^5)`C#j_B^SGSocs%nHK=u8rPMj4V(!PR6H4_Uwzc`qc+#i1G 44>7
zSmS%6rbiKN1*(bCJXd3ny}{Uf@QPi*xqbVUr(gOB3!QqpMP||2(D|dSsqi&(j(=M4
zbPlWTj?US+i~<%+p#tSkN{?LrS=_N`M7+kaCWa
zGzhXvSlR%`%~Rv`Flg^miP37B)ZX<$l
X^$VA&J6VmNP=dENsfCvh|
zc0WcEn=C58KODU$40l9G9-x-<2J-0OT5gt!@0NEt%|>HJ8mJXe#<2ODiC9Ck)SKJjbKH&gY3i24t8;%Y#>`q3n
zxi;azAak<7r+zvQsvC3=f2tFD3dbz1hAwUQ&
+(B1t>w>16;g}Rb$ew}KNu9>e8FBiSAl^vy2bL03{GYr+!e!_A76+~ozZ=nLt$=i
z?t!ZMrdMww=b?-l&($rR`p@oH$V-lQ57=moYiMYoSR*VcvD8Pan~UAt-1LP#mg9h~
zs)HQeOJovJb^0}9|F--x_c8X5-!v*V1>Wm_xPU<|67-bkdlSDoxijZ{SCe^@18&EZ
zD;LjBzWB}#aJ7{!`NdqHC}PaD##vSn5#$X$mFVyg1W+ac*Z=RiX?c(;wqD%4%xg
zC-tqV5S-N^xYf_6JeseQ^qp5GwJTIqpk=|qbmx;#%InCUd5(rD#R1;@`-^z}w9-9*
zs}D1GurV5$%@OFkfjjpwcr1wEScu-_V6Y1*%?v%LTa5l%_rAb=&JtYzmiq>DdIa%=
zccs*~Em7a&0+6M>`&C_AtC+XgmdI$nFy*@=|MA2YYy~zpHRY+#MV|N%${$|%zd*U=
zp-yZa@{KgoieO0n6aOhYaUu$)xql(dQ}^o=^?Fb|@}s}S`IceIh|9sj;cuM2Q(~RF
zjAP@Wd_xJ2>l9_5AF8Z4`mBcgQvhk-4elQY(!RMS<~q;ki=z&K^c(!W?@l;sIg_Fb
z(D(+~?k