From 6b4758654bef44b98f23409b18b131a36f23e352 Mon Sep 17 00:00:00 2001 From: evilew Date: Fri, 15 Nov 2024 23:15:35 +0100 Subject: [PATCH] moving over posters, small tweaks --- .../code/game/objects/effects/posters.dm | 98 ++++++++++++++++++ .../game/objects/effects/spawners/decals.dm | 71 +++++++++++++ GainStation13/code/obj/items/gato.dm | 2 + GainStation13/icons/obj/decals.dmi | Bin 37149 -> 37149 bytes code/modules/power/supermatter/supermatter.dm | 1 + 5 files changed, 172 insertions(+) create mode 100644 GainStation13/code/obj/items/gato.dm diff --git a/GainStation13/code/game/objects/effects/posters.dm b/GainStation13/code/game/objects/effects/posters.dm index ccfd5a2673..c1e72484a7 100644 --- a/GainStation13/code/game/objects/effects/posters.dm +++ b/GainStation13/code/game/objects/effects/posters.dm @@ -63,3 +63,101 @@ desc = "A poster from terran sectors, suggesting non-existence of mythical country of Malta." icon_state = "poster50" icon = 'GainStation13/icons/obj/contraband.dmi' + + +//recoloring of propaganda posters - from NT blue to GT pink +/obj/structure/sign/poster/gato/safety + name = "Here For Your Safety" + desc = "A poster glorifying the station's security force." + icon_state = "poster1_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/lovegato + name = "GATO Poster" + desc = "A poster with the GATO's friendly feline mascot." + icon_state = "poster2_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/cleanhands + name = "Cleanliness" + desc = "A poster warning of the dangers of poor hygiene." + icon_state = "poster3_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/helpothers + name = "Help Others" + desc = "A poster encouraging you to help fellow crewmembers." + icon_state = "poster4_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/buildstuff + name = "Build" + desc = "A poster glorifying the engineering team." + icon_state = "poster5_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/blessthisspess + name = "Bless This Spess" + desc = "A poster blessing this area." + icon_state = "poster6_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/science + name = "Science" + desc = "A poster depicting an atom." + icon_state = "poster7_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/arf + name = "Ian" + desc = "Arf arf. Yap." + icon_state = "poster8_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/obey + name = "Obey" + desc = "A poster instructing the viewer to obey authority." + icon_state = "poster9_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/walk + name = "Walk" + desc = "A poster instructing the viewer to walk instead of running." + icon_state = "poster10_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/statelaws + name = "State Laws" + desc = "A poster instructing cyborgs to state their laws." + icon_state = "poster11_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/loveian + name = "Love Ian" + desc = "Ian is love, Ian is life." + icon_state = "poster12_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/futurework + name = "Work For A Future" + desc = " A poster encouraging you to work for your future." + icon_state = "poster17_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/safety + name = "Safety: Internals" + desc = "A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic." + icon_state = "poster19_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/safety2 + name = "Safety: Eye Protection" + desc = "A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights." + icon_state = "poster20_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/gato/reportcrimes + name = "Report Crimes" + desc = "A poster encouraging the swift reporting of crime or seditious behavior to station security." + icon_state = "poster22_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' diff --git a/GainStation13/code/game/objects/effects/spawners/decals.dm b/GainStation13/code/game/objects/effects/spawners/decals.dm index f225c34d5b..8e61c22cc3 100644 --- a/GainStation13/code/game/objects/effects/spawners/decals.dm +++ b/GainStation13/code/game/objects/effects/spawners/decals.dm @@ -20,3 +20,74 @@ last_event = world.time active = 0 return + +//gato colored signs - from NT blue to GT pink +/obj/structure/sign/warning/gato + name = "\improper WARNING SIGN" + desc = "A warning sign which reads 'SECURE AREA'." + icon = 'GainStation13/icons/obj/decals.dmi' + +/obj/structure/sign/warning/gato/securearea + name = "\improper SECURE AREA" + desc = "A warning sign which reads 'SECURE AREA'." + +/obj/structure/sign/warning/gato/docking + name = "\improper KEEP CLEAR: DOCKING AREA" + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'." + +/obj/structure/sign/warning/gato/biohazard + name = "\improper BIOHAZARD" + desc = "A warning sign which reads 'BIOHAZARD'." + icon_state = "bio" + +/obj/structure/sign/warning/gato/electricshock + name = "\improper HIGH VOLTAGE" + desc = "A warning sign which reads 'HIGH VOLTAGE'." + icon_state = "shock" + +/obj/structure/sign/warning/gato/vacuum + name = "\improper HARD VACUUM AHEAD" + desc = "A warning sign which reads 'HARD VACUUM AHEAD'." + icon_state = "space" + +/obj/structure/sign/warning/gato/vacuum/external + name = "\improper EXTERNAL AIRLOCK" + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'." + layer = MOB_LAYER + +/obj/structure/sign/warning/gato/deathsposal + name = "\improper DISPOSAL: LEADS TO SPACE" + desc = "A warning sign which reads 'DISPOSAL: LEADS TO SPACE'." + icon_state = "deathsposal" + +/obj/structure/sign/warning/gato/pods + name = "\improper ESCAPE PODS" + desc = "A warning sign which reads 'ESCAPE PODS'." + icon_state = "pods" + +/obj/structure/sign/warning/gato/fire + name = "\improper DANGER: FIRE" + desc = "A warning sign which reads 'DANGER: FIRE'." + icon_state = "fire" + +/obj/structure/sign/warning/gato/nosmoking + name = "\improper NO SMOKING" + desc = "A warning sign which reads 'NO SMOKING'." + icon_state = "nosmoking2" + +/obj/structure/sign/warning/gato/nosmoking/circle + icon_state = "nosmoking" + +/obj/structure/sign/warning/gato/radiation + name = "\improper HAZARDOUS RADIATION" + desc = "A warning sign alerting the user of potential radiation hazards." + icon_state = "radiation" + +/obj/structure/sign/warning/gato/radiation/rad_area + name = "\improper RADIOACTIVE AREA" + desc = "A warning sign which reads 'RADIOACTIVE AREA'." + +/obj/structure/sign/warning/gato/enginesafety + name = "\improper ENGINEERING SAFETY" + desc = "A sign detailing the various safety protocols when working on-site to ensure a safe shift." + icon_state = "safety" diff --git a/GainStation13/code/obj/items/gato.dm b/GainStation13/code/obj/items/gato.dm new file mode 100644 index 0000000000..30796df4d9 --- /dev/null +++ b/GainStation13/code/obj/items/gato.dm @@ -0,0 +1,2 @@ +/////GS13 - reflavoring of items into GATO corp, mostly seperated variants so we don't overwrite NT + diff --git a/GainStation13/icons/obj/decals.dmi b/GainStation13/icons/obj/decals.dmi index 2813a82a6d0e5c8024bfdd12b01de3b735e54ae6..12740a1430b0e3903221df16428370140c163db0 100644 GIT binary patch delta 596 zcmV-a0;~O+LUhzxk?alpOP-t*g#}r?Kz#Wp@Gr*BDa8FTS#TK=DvZ8;%8IS!jP1N3Zwi0BL=z2YiIcMIdABG7V8L zA|DJYrk?i(dSUrsuvu#GO*J@z_m&Q75br61P_9&FPV2JFXC)ohoO^g1Hz6p+~71$|(*4aj2N>90p4eI9i=$uR{(&Z%zZ`09l{O15nYU zDgb|#swAUQae!}i`~agbY6iUVWAY4oUrBi~jy(^0G5bHTX;v0JOzpP4ytw)@d*;`- zIF>Hc5O01~-1ScIuLbb)63@@N=j`~1@_wBCOhd3;JnA<{f07*naRCt{1oq4m#0#uGU86O1z delta 597 zcmV-b0;>I;q5_?w0+4A$G4POzUr{fq^Y-Tc$HP;5_xR8pP%?3Bx9#TQYqL6%Ew0_R z*H_KTAq}p)zT^T0+iiQ+6Q4CJOOo4dd)cgZ0s&utk*pzq{w)@vxSTkHSJ}i?S8!l& zF(waxMtyZWfKeec=E9aB>gnP@QD4=740^$2G^0?NRM4^4A;DaPIjA6%z`0VsJy}aw z3HN?PBb@auJdt{R3s{0etnZBhDf-g*0-;K#z;TaLmw;laIbJUqxyB~4A&dquYe8Ki z<1kPzGU+*gPpF>NO;%XX=q4*%neDn(L_J@CwD!0wRiMz|>PU~fvVQzspS1?IBxnk8 z>~LO38;#CmO7nxS2N+sHqgg-)vwyWa3kR4DB=)u%=I@n=_tqOC9UiNRYb(w~! zTgiujirMFVfNn1z0yawnzNrC6@ZQovE#*B$5XzOx%xPVgIjw6lr*%Q*w5|reB+r=+ zSkssPq522*Y^TbJvS2R8LFiFxMstdTKpZM2Jcq#&1ddi`+3S!)&|B01IY8DY^8i%z zstQ1VrRtDTso20bH$TAWi+Tdy_%V3~y}P758ONRn-OT(kG{l>q6*s;U{A&UHyd?9po;f={qP!n!KhqFw7mxZq3~X0%%}HRpPYdI`y??rE j?;anTzb&SS^}5-#J^%n907*naRCt{1oq4>o$^ui4RTCrN diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 91ce6644a8..8790113ba6 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -965,6 +965,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) name = "supermatter shard" desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure." base_icon_state = "darkmatter_shard" + icon = 'GainStation13/icons/turf/supermatter.dmi' // GS13 EDIT 'icons/obj/supermatter.dmi' icon_state = "darkmatter_shard" anchored = FALSE gasefficency = 0.125