From 064061eedb3cb9a115cb3a2a8ef96ade91e18322 Mon Sep 17 00:00:00 2001 From: Twomoon <45800756+Twomoon-Github@users.noreply.github.com> Date: Fri, 21 Jul 2023 19:37:52 +0200 Subject: [PATCH] Adds more graffiti (faction themed) (#8238) * Adds more graffiti (faction themed) * Update code/game/objects/items/spraypaint.dm --------- Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> --- .../objects/effects/decals/Cleanable/misc.dm | 31 ++++++++++++++++++ code/game/objects/items/spraypaint.dm | 18 +++++++++- icons/effects/wall_graffiti.dmi | Bin 2043 -> 1710 bytes 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index fb625fe6296..eed39d25935 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -247,3 +247,34 @@ desc = "A graffiti of a heart." icon_state = "heart" +/obj/effect/decal/cleanable/graffiti/graffiti_excelsior + desc = "Ever Upwards!" + icon_state = "excelsior" + +/obj/effect/decal/cleanable/graffiti/graffiti_ironhammer + desc = "The best of the best." + icon_state = "ironhammer" + +/obj/effect/decal/cleanable/graffiti/graffiti_moebius + desc = "Science never stops." + icon_state = "moebius" + +/obj/effect/decal/cleanable/graffiti/graffiti_neotheo + desc = "Mutants not welcomed." + icon_state = "neotheo" + +/obj/effect/decal/cleanable/graffiti/graffiti_techno + desc = "Kickstart the Engine." + icon_state = "techno" + +/obj/effect/decal/cleanable/graffiti/graffiti_aster + desc = "Blood is the oldest currency." + icon_state = "aster" + +/obj/effect/decal/cleanable/graffiti/graffiti_ancapyes + desc = "The great Capital approves." + icon_state = "ancapyes" + +/obj/effect/decal/cleanable/graffiti/graffiti_ancapno + desc = "The free market isn't happy." + icon_state = "ancapno" diff --git a/code/game/objects/items/spraypaint.dm b/code/game/objects/items/spraypaint.dm index b505315e6d1..565385fdc68 100644 --- a/code/game/objects/items/spraypaint.dm +++ b/code/game/objects/items/spraypaint.dm @@ -12,7 +12,7 @@ /obj/item/spraypaint/afterattack(atom/target, mob/user as mob, proximity) if(!proximity) return if(istype(target,/turf)) - var/graffititype = input("Choose what you'd like to paint") in list("Kot","Onestar","Doodle","Piss","Clown","Skull","Heart") + var/graffititype = input("Choose what you'd like to paint") in list("Kot","Onestar","Doodle","Piss","Clown","Skull","Heart","Excelsior","Ironhammer","Moebius","Neotheology","Technomancer","Aster","Ancap yes","Ancap no") if(uses <= 0) playsound(loc, 'sound/effects/interaction/graffiti_empty.ogg', 100, 1) to_chat(user, SPAN_NOTICE("The spray can is empty.")) @@ -39,6 +39,22 @@ new /obj/effect/decal/cleanable/graffiti/graffiti_skull(target) if("Heart") new /obj/effect/decal/cleanable/graffiti/graffiti_heart(target) + if("Excelsior") + new /obj/effect/decal/cleanable/graffiti/graffiti_excelsior(target) + if("Ironhammer") + new /obj/effect/decal/cleanable/graffiti/graffiti_ironhammer(target) + if("Moebius") + new /obj/effect/decal/cleanable/graffiti/graffiti_moebius(target) + if("Neotheology") + new /obj/effect/decal/cleanable/graffiti/graffiti_neotheo(target) + if("Technomancer") + new /obj/effect/decal/cleanable/graffiti/graffiti_techno(target) + if("Aster") + new /obj/effect/decal/cleanable/graffiti/graffiti_aster(target) + if("Ancap yes") + new /obj/effect/decal/cleanable/graffiti/graffiti_ancapyes(target) + if("Ancap no") + new /obj/effect/decal/cleanable/graffiti/graffiti_ancapno(target) if(uses) uses-- if(uses <= 0) diff --git a/icons/effects/wall_graffiti.dmi b/icons/effects/wall_graffiti.dmi index 149e2c965ef8ccca14e0e59d7c1e37277fbba04e..ef9353e1cdf720160023ccb7bbef9ced45916839 100644 GIT binary patch literal 1710 zcmV;f22uHmP)C0002YP)t-sz`(%2 zg+{%{$$dgUGd4*W7$R0&akah2#L?A>lAka&Mj#_CHQb;ZB06ZVS}gFpK5766m6VLJRX=TQYvR|= z*1wXA1Q^W8xzL47Mn+V{C^^M)B}G0lVgwK=MROx|kH=pk^SL5$Up+jyr7(EOtCC^v zNK?8I5k`VCB~~s!HF9;QL$k!rjFh8LSbBayxVLZPz`($AMJl+2Fy6L3d4bA300001 zbW%=J06^y0W&i*H!g^F#bVOxyV{&P5bZKvH004NLjnYjH!XOX@;5D3rw0q;<){Ut# zUD!Jyj6w=b1Jvs6MVq)Y)7`w}%S#@i7RS@M?L>2F`2%9I7{o#BS8L8DtFtL#x8=-$ zy_-CTlx2o;Rz2p5Gi_rkX~WqqN)Pk>GZ>)Uk#rhSJ0RI$QzDUaI0aIresqph24tjH z!c&1OZ%6O65rdK515G``)sFOBneu`*8I&Aeu%PY(1ClNPW&^a#pv?ceTAaG(`}^Jw z{J2ZSGU00hEGL_t(|ob8$qTiQqvhqshSfP@NK1cL|4A33Ywwe%7J@d3X7ck0Y+ z0tz!5FKE5HXJ1K(B+c*L+1=RWK`D#HVzF5MjePpx+}!7n63_;pK2Sg-3*-sYIUIF_ zI9c*PLv(DwA5d^H-Yw<}hJ5F!R4O^83+K&hgBgZCUbumaqN zN>y5pQ@H?6;FlI+6!-(#+Z_iM^)JPEV}~>D!yQiI#Q>N8GEle{|328}TPzlf#bU8o z(rLGol|<+A^0IT4J;C$3-EL3J@Aun!CB+Y}udfG#&Mb3QQE_Pvm&&gG-N&TM)Na4s3!Xcj0uMmaM^394lU^><9uhrPy6ie}nb0E`V)i=vuTphSbMeIlUa1py*V*82xQEL5L})Kqei1u!4WPa69M zm>Pr;{sg=Ld{hevNnjRtzAyq8I)AZXOF+%05vZ%Me**j{jPt`OKM-R9wg?XkMXB_* zU>ZpMkF5{GfD<5e2f&D&3Y}o+0^#$mfpHSN0In9oR8WuN7)&G5-K�?_wh0Qqv2i~>}FvEwg16PpJZ+}$fQaD`nURw15-2VJP*Cphf=`!W_VG_l!grF^sgbqM$G ziGchMTW=&FJ;TAtZY=Q08|5qUFn+a literal 2043 zcmbW2YdjN-0>(EclFOL<$R$G|iniPnnLBft!=fek+v)vs&hPzjzMK!w^L%)|KF{x;;An3xE_zH9004;F+E`xwo#?+L za_F~nvcrvjNBVL8O5w65ja8<<`wFXtw?k4<+OrTHX;Q3M^;!Y(l zcj2i9-!?n1-t%JQk3)v`;2H0HsU{AykQ>8_R&N%vyt}TS_^Ms}Ms#6wCG+$z%*LZ} zVb7+Ug@LfVj^AwNe{!@>xXUY z*cJAB3e5{L#tW&Pt}l2|@E+ zQpYX6pNzW!u=ebhkVx(ZDw@3=Ex7$dapWBFuu;QtrE?iak_YzgXC&&@y+isO7T`OL z`542kw#KY(VByb)@MJC9jYK)rPDAFBWgeVQBd_yx7!U^-ka*3iX!Nj597(_JUs#*xQ$r?&`ab@g8-zWun+^{Iy=sbrGHt(@hJts_$o z!-|WwBPP%StD~{6>xJf9S`5nrSf3-DPt1%~pMtYFLXi_+@Q$-mtl=TK9?EgjYFq3` zNdd<9Yl#I`kJAcj=>~z7H@@$$EqXVCEg$Si2ZxUv1>GjJ9IfTMof>sn$K_Uan`S)q zijovD-2TWLOfG3Unj0Zz-2P_Aw9vv_Fg7;hz`j6J7=j)r&eqn?PUvOUY&E+1SIzCHU9WHT zc0*)20KbFff{{Jy8K>X+4Io#qcVvC}^>on6fO`CB*xA`=0=&=!4E_wzJfCIJbW6=~ z)1GyCK8P`$c;3NdqcUAX5@vvZm#k4>=n#7I6Kl}qMEc+jKiM55iJc&+$-vjlGIv#u zM%}wSc1S=RC)0EG8`8KvItQ9qAzhYMQ_KE9>p}Yq{0Ml6b0VTLe2X|XYi($e^p96Y##bzh+Hvk59Fx%Uw#i= z23D2Im1RW^OM-E2iI4~c0#jlHBQtI* zu0P*&EADXD4%HR18im(TDfSmx8aPAX7KTPw?b7FbTX~A_l3J43TGW6x&Fy8nPyBVB zepMyG`64&+Ai(U-sH+LfOm5gkxe@)uJ8Es&#bHHIMNf31!nsJ32s7jecEi!rALKa* zb6@aHS%sP2;i*r&N@*$7{(1+h$}By6Rgp6fh_mm>>wo!$fhny5{s4iN%yf{26gOGp zfmm;^Se@ucVW~jdfu^DKLG{p?`Y{x9kLGsE*^iCJI5BW=kaj z3ve>ibqhmB-Ve0&r>Ercwv7r{fHrx!$?zU8gO?4dC^uw+;ol0_~_lW@t zO*?3JQXE6dU zqE&;msI)R>jb%nb%+$Z)b+tv|QyO7fi}p123@-p_aYUQzH;UiH)cTUGorI0HO#xmp zgA8ZoEzcN}ZaBb72!i;F85{4nH4%R%+w3j`?zw`$#5(f3M7X_m6n*52_@BGXbj-g2=zZ3)