diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 7fece809d6d..23ca4aac6f6 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -98,6 +98,10 @@ - NFPosterContrabandFsbLogo # Frontier - NFPosterContrabandFsbStasis # Frontier - NFPosterContrabandFsbApothecary # Frontier + - NFPosterContrabandEatShrooms # Frontier + - NFPosterContrabandKillerFashion # Frontier + - NFPosterContrabandGoblinFront # Frontier + - NFPosterContrabandGoblinate # Frontier chance: 1 - type: entity @@ -157,4 +161,5 @@ - PosterLegitRenault - PosterLegitNTTGC - NFPosterLegitMagnusWatching # Frontier + - NFPosterLegitGoblinTinkerer # Frontier chance: 1 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml index 32db6578014..b60a0e9cb2a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml @@ -8,6 +8,16 @@ sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster1_legit +- type: entity + parent: PosterBase + id: NFPosterLegitGoblinTinkerer + name: "Tinkering!" + description: "This poster depicts a cheerful goblin engineer telling you that explosions are the spice of tinkering." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster2_legit + - type: entity parent: PosterBase id: NFPosterContrabandLvhiStation @@ -37,7 +47,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster3_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbLogo @@ -47,7 +57,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster4_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbStasis @@ -57,7 +67,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster5_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbApothecary @@ -67,7 +77,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster6_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbSpirit @@ -77,7 +87,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster7_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandEmsCoords @@ -87,3 +97,43 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster8_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandEatShrooms + name: "Eat Shrooms!" + description: "Eat Shrooms!" + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster12_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandKillerFashion + name: "Da Burkin' Fashion" + description: "A printed copy of what appears to be a hand-drawn poster of a goblin in a tattered tunic with a spear." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster13_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandGoblinFront + name: "Goblinkin, Unite!" + description: "A poster rallying goblins to unite and fight for their rights." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster14_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandGoblinate + name: "Da Great Space Goblinate!" + description: "A poster calling to restore The Great Goblinate in all its former glory." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster15_contraband diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json index 26b175e8ee2..9d26f34d345 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)", + "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster2_legit (Based on poster31 from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband, nt_poster12_contraband (inspired by poster11 from https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi and painting Rainbow Swirl by Saira Scott), nt_poster13_contraband (used poster1 as background from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nt_poster14_contraband (Resprited poster19 from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nt_poster15_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "nf_poster1_legit" }, + { + "name": "nf_poster2_legit" + }, { "name": "nf_poster1_contraband" }, @@ -33,6 +36,18 @@ }, { "name": "nf_poster8_contraband" + }, + { + "name": "nf_poster12_contraband" + }, + { + "name": "nf_poster13_contraband" + }, + { + "name": "nf_poster14_contraband" + }, + { + "name": "nf_poster15_contraband" } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster12_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster12_contraband.png new file mode 100644 index 00000000000..250d6dffc23 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster12_contraband.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster13_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster13_contraband.png new file mode 100644 index 00000000000..464fa60913d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster13_contraband.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster14_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster14_contraband.png new file mode 100644 index 00000000000..1424052c5cc Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster14_contraband.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster15_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster15_contraband.png new file mode 100644 index 00000000000..4246162d351 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster15_contraband.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster2_legit.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster2_legit.png new file mode 100644 index 00000000000..747de9bbb5e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster2_legit.png differ