diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index db266ffb3f..541a766fef 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -85,6 +85,12 @@ - PosterContrabandNuclearDeviceInformational - PosterContrabandRevolt - PosterContrabandRise + - PosterContrabandMoth + - PosterContrabandCybersun600 + - PosterContrabandDonk + - PosterContrabandEnlistGorlex + - PosterContrabandInterdyne + - PosterContrabandWaffleCorp chance: 1 - type: entity @@ -139,4 +145,8 @@ - PosterLegitThereIsNoGasGiant - PosterLegitJustAWeekAway - PosterLegitSecWatch + - PosterLegitVacation + - PosterLegitPeriodicTable + - PosterLegitRenault + - PosterLegitNTTGC chance: 1 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 61c6c308c9..5306273a64 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -537,6 +537,59 @@ - type: Sprite state: poster56_contraband +- type: entity + parent: PosterBase + id: PosterContrabandMoth + name: "Syndie Moth - Nuclear Operation" + description: "A Syndicate-commissioned poster that uses Syndie Moth™ to tell the viewer to keep the nuclear authentication disk unsecured. \"Peace was never an option!\" No good employee would listen to this nonsense." + components: + - type: Sprite + state: poster57_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandCybersun600 + name: "Cybersun: 600 Years Commemorative Poster" + description: "An artistic poster commemorating 600 years of continual business for Cybersun Industries." + components: + - type: Sprite + state: poster58_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandDonk + name: "DONK CO. BRAND MICROWAVEABLE FOOD" + description: "DONK CO. BRAND MICROWAVABLE FOOD: MADE BY STARVING COLLEGE STUDENTS, FOR STARVING COLLEGE STUDENTS." + components: + - type: Sprite + state: poster59_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandEnlistGorlex + name: "Enlist" + description: "Enlist with the Gorlex Marauders today! See the galaxy, kill corpos, get paid!" + components: + - type: Sprite + state: poster60_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandInterdyne + name: "Interdyne Pharmaceutics: For the Health of Humankind" + description: "An advertisement for Interdyne Pharmaceutics' GeneClean clinics. 'Become the master of your own body!'" + components: + - type: Sprite + state: poster61_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandWaffleCorp + name: "Make Mine a Waffle Corp: Fine Rifles, Economic Prices" + description: "An old advertisement for Waffle Corp rifles. 'Better weapons, lower prices!'" + components: + - type: Sprite + state: poster62_contraband # Legit - type: entity @@ -898,7 +951,7 @@ components: - type: Sprite state: poster40_legit - + - type: entity parent: PosterBase id: PosterLegitMime @@ -916,7 +969,88 @@ components: - type: Sprite state: poster42_legit - + +- type: entity + parent: PosterBase + id: PosterLegitSafetyMothDelam + name: "Safety Moth - Delamination Safety Precautions" + description: "This informational poster uses Safety Moth™ to tell the viewer to hide in lockers when the Supermatter Crystal has delaminated, to prevent hallucinations. Evacuating might be a better strategy." + components: + - type: Sprite + state: poster43_legit + +- type: entity + parent: PosterBase + id: PosterLegitSafetyMothEpi + name: "Safety Moth - Epinephrine" + description: "This informational poster uses Safety Moth™ to inform the viewer to help injured/deceased crewmen with their epinephrine injectors. \"Prevent organ rot with this one simple trick!\"" + components: + - type: Sprite + state: poster44_legit + +- type: entity + parent: PosterBase + id: PosterLegitSafetyMothHardhat + name: "Safety Moth - Hardhats" + description: "This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. \"It's like a lamp for your head!\"" + components: + - type: Sprite + state: poster45_legit + +- type: entity + parent: PosterBase + id: PosterLegitSafetyMothMeth + name: "Safety Moth - Methamphetamine" + description: "This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. \"Stay close to the target temperature, and never go over!\" ...You shouldn't ever be making this." + components: + - type: Sprite + state: poster46_legit + +- type: entity + parent: PosterBase + id: PosterLegitSafetyMothPiping + name: "Safety Moth - Piping" + description: "This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. \"Pipes, not Pumps! Proper pipe placement prevents poor performance!\"" + components: + - type: Sprite + state: poster47_legit + +- type: entity + parent: PosterBase + id: PosterLegitVacation + name: "Nanotrasen Corporate Perks: Vacation" + description: "This informational poster provides information on some of the prizes available via the NT Corporate Perks program, including a two-week vacation for two on the resort world Idyllus." + components: + - type: Sprite + state: poster48_legit + +- type: entity + parent: PosterBase + id: PosterLegitPeriodicTable + name: "Periodic Table of the Elements" + description: "A periodic table of the elements, from Hydrogen to Oganesson, and everything inbetween." + components: + - type: Sprite + state: poster49_legit + +- type: entity + parent: PosterBase + id: PosterLegitRenault + name: "Renault Poster" + description: "Yap." + components: + - type: Sprite + state: poster50_legit + +- type: entity + parent: PosterBase + id: PosterLegitNTTGC + name: "Nanotrasen Tactical Game Cards" + description: "An advertisement for Nanotrasen's TCG cards: BUY MORE CARDS." + components: + - type: Sprite + state: poster51_legit + #maps - type: entity diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index cde1eaf618..b0d8f4e681 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster57_contraband"}, {"name": "poster58_contraband"}, {"name": "poster59_contraband"}, {"name": "poster60_contraband"}, {"name": "poster61_contraband"}, {"name": "poster62_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "poster43_legit"}, {"name": "poster44_legit"}, {"name": "poster45_legit"}, {"name": "poster46_legit"}, {"name": "poster47_legit"}, {"name": "poster48_legit"}, {"name": "poster49_legit"}, {"name": "poster50_legit"}, {"name": "poster51_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_legit.png new file mode 100644 index 0000000000..2aa4745dda Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster43_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_legit.png new file mode 100644 index 0000000000..66c7d3f79e Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster44_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_contraband.png index a9f6a06fdc..b1c034bd2a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_legit.png new file mode 100644 index 0000000000..5954cec862 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster45_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_legit.png new file mode 100644 index 0000000000..ae6d745b3f Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster46_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster47_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster47_legit.png new file mode 100644 index 0000000000..cc24351424 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster47_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_legit.png new file mode 100644 index 0000000000..8d2d6dea98 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster48_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster49_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster49_legit.png new file mode 100644 index 0000000000..f68a2802a2 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster49_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png new file mode 100644 index 0000000000..902ca4ff1f Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster50_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png new file mode 100644 index 0000000000..2c37cc4415 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster51_legit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster57_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster57_contraband.png new file mode 100644 index 0000000000..9c3e7bc9ff Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster57_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster58_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster58_contraband.png new file mode 100644 index 0000000000..3a6542aaef Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster58_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png new file mode 100644 index 0000000000..307ca195dc Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster59_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png new file mode 100644 index 0000000000..e597b62d6a Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster60_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster61_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster61_contraband.png new file mode 100644 index 0000000000..3eb0d49718 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster61_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster62_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster62_contraband.png new file mode 100644 index 0000000000..0c17046107 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster62_contraband.png differ