diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 443b6b68bf..9605ba9a37 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -79,6 +79,9 @@ - PosterContrabandGotWood - PosterContrabandWehWatches - PosterContrabandVoteWeh + - PosterContrabandBeachStarYamamoto + - PosterContrabandHighEffectEngineering + - PosterContrabandNuclearDeviceInformational chance: 1 - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 5901af01b4..4ca2f5f4ce 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -499,6 +499,35 @@ - type: Sprite state: poster51_contraband +# These 3 originally from VEEGEE +- type: entity + parent: PosterBase + id: PosterContrabandBeachStarYamamoto + name: "Beach Star Yamamoto!" + description: "A wall scroll depicting an old swimming anime with girls in small swim suits. You feel more weebish the longer you look at it." + components: + - type: Sprite + state: poster52_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandHighEffectEngineering + name: "High Effect Engineering" + description: "There are 3 shards and a singularity. The shards are singing. The engineers are crying." + components: + - type: Sprite + state: poster53_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandNuclearDeviceInformational + name: "Nuclear Device Informational" + description: "This poster depicts an image of an old style nuclear explosive device, as well as some helpful information on what to do if one has been set. It suggests lying on the floor and crying." + components: + - type: Sprite + state: poster54_contraband + + # Legit - type: entity parent: PosterBase diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index ffe4c195b5..72d65083f3 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1,328 +1 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b", - "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": "poster49_contraband" - }, - { - "name": "poster50_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": "random_legit" - }, - { - "name": "random_contraband" - }, - { - "name": "random_anything" - } - ] -} +{"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", "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": "poster49_contraband"}, {"name": "poster50_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": "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]]}]} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_contraband.png new file mode 100644 index 0000000000..c2dc01e3fd Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png new file mode 100644 index 0000000000..3000e77cd0 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png differ diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster54_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster54_contraband.png new file mode 100644 index 0000000000..1e9ce74c1f Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster54_contraband.png differ