Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Add some posters #1584

Merged
merged 3 commits into from
Dec 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/objects/effects/decals/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

poster_type = given_poster_type || poster_type
if(!poster_type)
poster_type = pick(subtypesof(/singleton/poster))
poster_type = pick(subtypesof(/singleton/poster) - list(/singleton/poster/torch, /singleton/poster/contraband_only))
..()

/obj/item/contraband/poster/Initialize()
Expand Down Expand Up @@ -104,7 +104,7 @@
if(give_poster_type)
poster_type = give_poster_type
else
poster_type = pick(subtypesof(/singleton/poster) - typesof(/singleton/poster/torch))
poster_type = pick(subtypesof(/singleton/poster) - typesof(/singleton/poster/torch) - typesof(/singleton/poster/contraband_only))
if(torch_poster)
poster_type = pick(subtypesof(/singleton/poster/torch))
set_poster(poster_type)
Expand Down
63 changes: 63 additions & 0 deletions code/game/objects/effects/decals/posters/bs12.dm
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,69 @@
name = "SCGF recruitment poster"
desc = "A poster produced by the SCGF. It depicts a tactical-looking Fourth Fleet petty officer, standing in front of the SCG flag proudly."

/singleton/poster/annoyed_gas
icon_state = "annoyed_gas"
name = "Annoyed GAS"
desc = "The poster shows a chittering Giant Armored Serpentid with its scythe arms raised \
and ready to attack. \"Run!\" is written in big red letters, and at the very bottom there \
is a small text: \"If during the communication process the GAS began to actively chitter, \
buzz, raised sickles or strikes in the air with them - you must turn around and leave him \
alone.\""

/singleton/poster/healthy_hugs
icon_state = "healthy_hugs"
name = "Healthy hugs"
desc = "The poster shows a Giant Armored Serpentid holding a girl with a yellow flower in \
her hair with sickles. On the left - a large inscription \"HUGS\" in green letters, under \
which it is written in small letters: \"Hugs are useful both morally and physically: for \
example, the human race lowers blood pressure and produces oxytocin. Almost any crew will \
increase confidence and feel good. The main thing is - be sure to ask permission.\""

/singleton/poster/no_alcohol
icon_state = "no_alcohol"
name = "СП * РТ"
desc = "At the very top of the poster is a word, where one of the letters is replaced by \
an asterisk: \"СП * РТ\", and below - two signatures. The first: \"o - сила\", the second \
\"и - могила\". The poster is clean and without small text, which makes it clear the \
seriousness of the statement."

/singleton/poster/pizza_for_captain
icon_state = "pizza_for_captain"
name = "Pizza for Captain"
desc = "On fairly cheap thick paper, the red inscription reads: \"Pizza for Captain\". The \
slice of pizza itself is also drawn... with pineapples? Wouldn't eat this for anything! \
Someone apparently doesn't like the captain very much..."

/singleton/poster/would_you_plant
icon_state = "would_you_plant"
name = "Would you seed?"
desc = "A large green poster shows a brand new hydroponic tray. On top is a large text with \
the evocative question, \"Would you seed?\", with small text explaining, \"Hydroponic trays \
allow you to grow absolutely any crop quickly and efficiently, and the indicators tell you \
when the plant needs care! And how can you not seed one of these?\""

/singleton/poster/cabbage_tray
icon_state = "cabbage_tray"
name = "Cabbage tray"
desc = "The poster shows a Giant Armored Serpentid with a hydroponic tray of ripe cabbage \
in front of it, indicated by a green indicator on it. On the left side of the poster it \
says: \"Most GAS don't know how to cut existing plantings. Please don't plant all the trays \
and leave a few free ones. In order for the serpentid to eat, it only needs literally a \
couple of empty trays.\""

/singleton/poster/contraband_only
icon_state = "poster_ripped"
name = "Contraband Poster"
desc = "You probably shouldn't be seeing this."

/singleton/poster/contraband_only/unusual_gas
icon_state = "unusual_gas"
name = "Unusual GAS"
desc = "The poster shows a Giant Armored Serpentid. On his tail is what appears to be a \
large black gaiter with purple stripes. GAS sickles are dressed in cute little mitts of \
the same color. The entire lower right corner of the poster is occupied by a large \
inscription \"uwu\", and in the lower left it says: \"More on our site - WetSkrell.nt\"."

/singleton/poster/torch
icon_state="poster_ripped"
name = "Torch Poster"
Expand Down
Binary file modified icons/obj/structures/contraband.dmi
Binary file not shown.
4 changes: 2 additions & 2 deletions maps/sierra/_references/z1-3_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26269,7 +26269,7 @@
/obj/floor_decal/corner/green/border{
dir = 4
},
/obj/structure/sign/poster/nyc/would_you_plant{
/obj/structure/sign/poster/would_you_plant{
pixel_x = 32
},
/turf/simulated/floor/tiled,
Expand Down Expand Up @@ -49352,7 +49352,7 @@
/obj/floor_decal/techfloor{
dir = 9
},
/obj/structure/sign/poster/nyc/unusual_gas{
/obj/structure/sign/poster/unusual_gas{
pixel_x = -32
},
/obj/structure/closet/shipping_wall/filled{
Expand Down
29 changes: 29 additions & 0 deletions maps/sierra/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,32 @@
to_chat(usr, description)
return TOPIC_HANDLED
. = ..()


/obj/structure/sign/poster/annoyed_gas
icon_state = "annoyed_gas"
poster_type = /singleton/poster/annoyed_gas

/obj/structure/sign/poster/healthy_hugs
icon_state = "healthy_hugs"
poster_type = /singleton/poster/healthy_hugs

/obj/structure/sign/poster/no_alcohol
icon_state = "no_alcohol"
poster_type = /singleton/poster/no_alcohol

/obj/structure/sign/poster/pizza_for_captain
icon_state = "pizza_for_captain"
poster_type = /singleton/poster/pizza_for_captain

/obj/structure/sign/poster/would_you_plant
icon_state = "would_you_plant"
poster_type = /singleton/poster/would_you_plant

/obj/structure/sign/poster/cabbage_tray
icon_state = "cabbage_tray"
poster_type = /singleton/poster/cabbage_tray

/obj/structure/sign/poster/unusual_gas
icon_state = "unusual_gas"
poster_type = /singleton/poster/contraband_only/unusual_gas
2 changes: 1 addition & 1 deletion maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -105042,7 +105042,7 @@
/obj/item/flora/pottedplantsmall/leaf,
/obj/floor_decal/corner/grey/diagonal,
/obj/floor_decal/industrial/outline/yellow,
/obj/structure/sign/poster/nyc/unusual_gas{
/obj/structure/sign/poster/unusual_gas{
pixel_y = 32
},
/turf/simulated/floor/tiled,
Expand Down
2 changes: 1 addition & 1 deletion mods/_maps/farfleet/maps/farfleet-2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5194,7 +5194,7 @@
/obj/machinery/light{
dir = 1
},
/obj/structure/sign/poster/nyc/no_alcohol{
/obj/structure/sign/poster/no_alcohol{
pixel_y = 32
},
/turf/simulated/floor/tiled/white,
Expand Down
Loading