cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Poster Refactor + TCAF GPS Tags (#20278)

Browse Source 
- TCAF Corvette given GPS tags and posters for recruitment
- In process ballooned into major poster refactoring, replacing global
list with singletons and adding defined poster subtypes for mappers
- All defined posters switched to subtype equivalent

Held of on placing any posters in Horizon, as that would be best for a
seperate PR if I ever do that

We also might need better names for some of these posters.

---------

Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
This commit is contained in:
Ben
2025-01-31 13:53:23 +00:00
committed by GitHub
co-authored by Ben10083 hazelrat
parent f5fd3a9229
commit 25569ce312
16 changed files with 739 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/contraband.dm
+28 -27
View File
@@ -14,16 +14,20 @@
icon_state = "rolled_poster"
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
var/serial_number = 0
/// Set this variable to a /singleton/poster_design specify a desired poster.
/// If unset, is randomly set on `Initialize()`
var/singleton/poster_design/poster_type
/obj/item/contraband/poster/Initialize(mapload, given_serial = 0)
/obj/item/contraband/poster/Initialize(mapload, given_type)
. = ..()
if(given_serial == 0)
serial_number = rand(1, GLOB.poster_designs.len)
if(!poster_type)
if(!given_type)
poster_type = pick(GET_SINGLETON_SUBTYPE_LIST(/singleton/poster_design))
else
poster_type = given_type
else
serial_number = given_serial
name += " - No. [serial_number]"
poster_type = GET_SINGLETON(poster_type)
name += " - [poster_type.name]"
//Places the poster on a wall
/obj/item/contraband/poster/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
@@ -59,7 +63,7 @@
to_chat(user, SPAN_NOTICE("You start placing the poster on the wall...")) //Looks like it's uncluttered enough. Place the poster.)
var/obj/structure/sign/poster/P = new(user.loc, get_dir(user, W), serial_number)
var/obj/structure/sign/poster/P = new(user.loc, get_dir(user, W), poster_type)
flick("poster_being_set", P)
playsound(W, 'sound/items/package_wrap.ogg', 100, 1)
@@ -85,26 +89,22 @@
icon = 'icons/obj/contraband.dmi'
icon_state = "poster_map"
anchored = 1
var/serial_number //Will hold the value of src.loc if nobody initialises it
var/poster_type //So mappers can specify a desired poster
/// Set this variable to a /singleton/poster_design to specify a desired poster.
/// If unset, is randomly set on `Initialize()`
var/singleton/poster_design/poster_type
var/ruined = FALSE
/obj/structure/sign/poster/Initialize(mapload, placement_dir = null, serial = null)
/obj/structure/sign/poster/Initialize(mapload, placement_dir = null, type = null)
. = ..()
if(!serial)
serial = rand(1, GLOB.poster_designs.len) //use a random serial if none is given
serial_number = serial
var/datum/poster/design
if (poster_type)
var/path = text2path(poster_type)
design = new path
poster_type = GET_SINGLETON(poster_type)
else if(type)
poster_type = type
else
design = GLOB.poster_designs[serial_number]
poster_type = pick(GET_SINGLETON_SUBTYPE_LIST(/singleton/poster_design))
set_poster(design)
set_poster(poster_type)
switch (placement_dir)
if (NORTH)
@@ -121,10 +121,10 @@
pixel_y = 0
/obj/structure/sign/poster/proc/set_poster(var/datum/poster/design)
/obj/structure/sign/poster/proc/set_poster(var/singleton/poster_design/design)
name = "[initial(name)] - [design.name]"
desc = "[initial(desc)] [design.desc]"
icon_state = design.icon_state // poster[serial_number]
icon_state = design.icon_state
/obj/structure/sign/poster/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.iswirecutter())
@@ -156,14 +156,15 @@
add_fingerprint(user)
/obj/structure/sign/poster/proc/roll_and_drop(turf/newloc)
var/obj/item/contraband/poster/P = new(src, serial_number)
var/obj/item/contraband/poster/P = new(src, poster_type)
P.forceMove(newloc)
src.forceMove(P)
qdel(src)
/datum/poster
// Name suffix. Poster - [name]
/singleton/poster_design
/// Name suffix. Poster - [name]
var/name = ""
// Description suffix
/// Description suffix
var/desc = ""
/// The actual design
var/icon_state = ""
code/game/objects/effects/decals/posters/bs12.dm
+53 -53
View File
@@ -1,245 +1,245 @@
// aurora station posters
/datum/poster/bay_1
/singleton/poster_design/civilian/bay_1
icon_state="bsposter1"
name = "Unlucky Space Explorer"
desc = "This particular one depicts a skeletal form within a space suit."
/datum/poster/bay_8
/singleton/poster_design/pinup/bay_8
icon_state="bsposter8"
name = "Pinup Girl Cindy"
desc = "This particular one is of a historical corporate PR girl, Cindy, in a particularly feminine pose."
/datum/poster/bay_9
/singleton/poster_design/pinup/bay_9
icon_state="bsposter9"
name = "Pinup Girl Amy"
desc = "This particular one is of Amy, the nymphomaniac urban legend of deep space. How this photograph came to be is not known."
/datum/poster/bay_16
/singleton/poster_design/civilian/bay_16
icon_state="bsposter16"
name = "Dangerous Static"
desc = "This particular one depicts nothing remarkable other than a rather mesmerising pattern of monitor static. There's a tag on the sides of the poster, but it's ripped off."
/datum/poster/bay_17
/singleton/poster_design/pinup/bay_17
icon_state="bsposter17"
name = "Pinup Girl Val"
desc = "Luscious Val McNeil, the vertically challenged Legal Extraordinaire, winner of Miss Space two years running and favoured pinup girl of Lawyers Weekly."
/datum/poster/bay_19
/singleton/poster_design/civilian/bay_19
icon_state="bsposter19"
name = "Respect a Unathi"
desc = "This poster depicts a well dressed looking Unathi receiving a prestigious award. It appears to espouse greater co-operation and harmony between the two races."
/datum/poster/bay_20
/singleton/poster_design/civilian/bay_20
icon_state="bsposter20"
name = "Skrell Twilight"
desc = "This poster depicts a mysteriously inscrutable, alien scene. Numerous Skrell can be seen conversing amidst great, crystalline towers rising above crashing waves"
/datum/poster/bay_21
/singleton/poster_design/security/bay_21
icon_state="bsposter21"
name = "Join the Fuzz!"
desc = "It's a nice recruitment poster of a white haired Chinese woman that says; \"Big Guns, Hot Women, Good Times. Security. We get it done.\""
/datum/poster/bay_22
/singleton/poster_design/science/bay_22
icon_state="bsposter22"
name = "Looking for a career with excitement?"
desc = "A recruitment poster starring a dark haired woman with glasses and a purple shirt that has \"Got Brains? Got Talent? Not afraid of electric flying monsters that want to suck the soul out of you? Then Xenobiology could use someone like you!\" written on the bottom."
/datum/poster/bay_23
/singleton/poster_design/engineering/bay_23
icon_state="bsposter23"
name = "Safety first: because electricity doesn't wait!"
desc = "A safety poster starring a clueless looking redhead with frazzled hair. \"Every year, hundreds of NT employees expose themselves to electric shock. Play it safe. Avoid suspicious doors after electrical storms, and always wear protection when doing electric maintenance.\""
desc = "A safety poster starring a clueless looking redhead with frazzled hair. \"Every year, hundreds of SCC-affiliated employees expose themselves to electric shock. Play it safe. Avoid suspicious doors after electrical storms, and always wear protection when doing electric maintenance.\""
/datum/poster/bay_24
/singleton/poster_design/medical/bay_24
icon_state="bsposter24"
name = "Responsible medbay habits, No #259"
desc = "A poster instructing all crew to respect doctor-patient confidentiality."
/datum/poster/bay_25
/singleton/poster_design/medical/bay_25
icon_state="bsposter25"
name = "Irresponsible medbay habits, No #2"
desc = "This is a safety poster starring a doctor. It instructs the viewer to report all medical misconduct."
/datum/poster/bay_26
/singleton/poster_design/civilian/bay_26
icon_state="bsposter26"
name = "The Men We Knew"
desc = "This movie poster depicts a group of soldiers fighting a large mech, the movie seems to be a patriotic war movie."
/datum/poster/bay_27
/singleton/poster_design/civilian/bay_27
icon_state="bsposter27"
name = "Plastic Sheep Can't Scream"
desc = "This is a movie poster for an upcoming horror movie, it features an AI in the front of it."
/datum/poster/bay_28
/singleton/poster_design/civilian/bay_28
icon_state="bsposter28"
name = "The Stars Know Love"
desc = "This is a movie poster. A bleeding woman is shown drawing a heart in her blood on the window of space ship, it seems to be a romantic Drama."
/datum/poster/bay_30
/singleton/poster_design/civilian/bay_30
icon_state="bsposter30"
name = "Ambrosia Vulgaris"
desc = "Just looking at this poster makes you feel a little bit dizzy."
/datum/poster/bay_31
/singleton/poster_design/civilian/bay_31
icon_state="bsposter31"
name = "GetMore Donuts"
desc = "This is an advertisement for GetMore's brand of donuts!"
/datum/poster/bay_32
/singleton/poster_design/civilian/bay_32
icon_state="bsposter32"
name = "Eat!"
desc = "A poster depicting a hamburger. The poster orders you to consume the hamburger."
/datum/poster/bay_33
/singleton/poster_design/engineering/bay_33
icon_state="bsposter33"
name = "Tools, tools, tools"
desc = "You can never have enough tools, thats for sure!"
/datum/poster/bay_34
/singleton/poster_design/engineering/bay_34
icon_state="bsposter34"
name = "Power Up!"
desc = "High reward, higher risk!"
/datum/poster/bay_36
/singleton/poster_design/civilian/bay_36
icon_state="bsposter36"
name = "Fancy Borg"
desc = "A poster depicting a cyborg using the service module. 'Fancy Borg' is written on it."
/datum/poster/bay_37
/singleton/poster_design/civilian/bay_37
icon_state="bsposter37"
name = "Fancier Borg"
desc = "A poster depicting a cyborg using the service module. 'Fancy Borg' is written on it. This is even fancier than the first poster."
/datum/poster/bay_38
/singleton/poster_design/civilian/bay_38
icon_state="bsposter38"
name = "Toaster Love"
desc = "This is a poster of a toaster containing two slices of bread. The word LOVE is written in big pink letters underneath."
/datum/poster/bay_39
/singleton/poster_design/medical/bay_39
icon_state="bsposter39"
name = "Responsible medbay habits, No #91"
desc = "A safety poster with a chemist holding a vial. \"Always wear safety gear while handling dangerous chemicals, even if it concerns only small amounts.\""
/datum/poster/bay_40
/singleton/poster_design/command/bay_40
icon_state="bsposter40"
name = "Agreeable work environment"
desc = "This poster depicts a young woman in a stylish dress. \"Try to aim for a pleasant atmosphere in the workspace. A friendly word can do more than forms in triplicate.\""
/datum/poster/bay_41
/singleton/poster_design/command/bay_41
icon_state="bsposter41"
name = "Professional work environment"
desc = "A safety poster featuring a green haired woman in a shimmering blue dress. \"As an Internal Affairs Agent, your job is to create a fair and agreeable work environment for the crewmembers, as discreetly and professionally as possible.\""
desc = "A safety poster featuring a green haired woman in a shimmering blue dress. \"As a member of Human Resources, your job is to create a fair and agreeable work environment for the crewmembers, as discreetly and professionally as possible.\""
/datum/poster/bay_42
/singleton/poster_design/pinup/bay_42
icon_state="bsposter42"
name = "Engineering pinup"
desc = "This is pin-up poster. A half-naked girl with white hair, toned muscles and stunning blue eyes looks back at you from the poster. Her welding helmet, tattoos and grey jumpsuit hanging around her waist gives a bit of a rugged feel."
/datum/poster/bay_43
/singleton/poster_design/medical/bay_43
icon_state="bsposter43"
name = "Responsible medbay habits, No #3"
desc = "A safety poster with a purple-haired surgeon. She looks a bit cross. \"Let the surgeons do their work. NEVER replace or remove a surgery tool from where the surgeon put it.\""
/datum/poster/bay_44
/singleton/poster_design/civilian/bay_44
icon_state="bsposter44"
name = "Time for a drink?"
desc = "This poster depicts a friendly-looking Tajara holding a tray of drinks."
/datum/poster/bay_45
/singleton/poster_design/engineering/bay_45
icon_state="bsposter45"
name = "Responsible engineering habits, No #1"
desc = "A safety poster featuring a blue haired engineer. \"When repairing a machine or construction, always aim for long-term solutions.\""
/datum/poster/bay_47
/singleton/poster_design/pinup/bay_47
icon_state="bsposter47"
name = "Security pinup"
desc = "This is a pin-up poster. A dark skinned white haired girl poses in the sunlight wearing a tank top with her stomach exposed. The text on the poster states \"M, Succubus of Security.\" and a lipstick mark stains the top right corner, as if kissed by the model herself."
/datum/poster/bay_48
/singleton/poster_design/pinup/bay_48
icon_state="bsposter48"
name = "Borg pinup?"
desc = "This is a.. pin-up poster? It is a diagram on an old model of cyborg with a note scribbled in marker on the bottom, on the top there is a large XO written in red marker."
desc = "This is a.. pin-up poster? It is a diagram on an old model of cyborg with a note scribbled in EAL with marker on the bottom, on the top there is a large XO written in red marker."
/datum/poster/bay_49
/singleton/poster_design/engineering/bay_49
icon_state="bsposter49"
name = "Engineering recruitment"
desc = "This is a poster showing an engineer relaxing by a computer, the text states \"Living the life! Join Engineering today!\""
/datum/poster/bay_51
/singleton/poster_design/civilian/bay_51
icon_state="bsposter51"
name = "space appreciation poster"
desc = "This is a poster produced as a part of a series of commemorative posters on the wonders of space. One of three."
/datum/poster/bay_52
/singleton/poster_design/engineering/bay_52
icon_state="bsposter52"
name = "fire safety poster"
desc = "This is a poster reminding you of what you should do if you are on fire, or if you are at a dance party."
/datum/poster/bay_53
/singleton/poster_design/engineering/bay_53
icon_state="bsposter53"
name = "fire extinguisher poster"
desc = "This is a poster reminding you of what you should use to put out a fire."
/datum/poster/bay_54
/singleton/poster_design/engineering/bay_54
icon_state="bsposter54"
name = "firefighter poster"
desc = "This is a poster of a particularly stern looking firefighter. The caption reads, \"Only you can prevent space fires.\""
/datum/poster/bay_55
/singleton/poster_design/civilian/bay_55
icon_state="bsposter55"
name = "Earth appreciation poster"
desc = "This is a poster produced as a part of a series of commemorative posters on the wonders of space. Two of three. Why does it say Terra instead of Earth?"
/datum/poster/bay_56
/singleton/poster_design/civilian/bay_56
icon_state="bsposter56"
name = "Mars appreciation poster"
desc = "This is a poster produced as a part of a series of commemorative posters on the wonders of space. Three of three."
/datum/poster/bay_57
/singleton/poster_design/civilian/bay_57
icon_state="bsposter57"
name = "space carp warning poster"
desc = "This poster tells of the dangers of carp infestations. This one depicts a cartoonish image of a carp, as opposed to a realistic one."
/datum/poster/bay_58
/singleton/poster_design/civilian/bay_58
icon_state="bsposter58"
name = "ursa major poster"
desc = "This poster displays a picture of a popular cartoon character."
/datum/poster/bay_60
/singleton/poster_design/civilian/bay_60
icon_state = "bsposter60"
name = "N.S.S. Aurora"
desc = "This poster is a picture of the old, now defunct, N.S.S. Aurora. Commissioned in 2454 and decommissioned in the early days of 2458."
/datum/poster/bay_61
/singleton/poster_design/science/bay_61
icon_state = "bsposter61"
name = "Xenobiology Safety Protocols"
desc = "This posters warms the crew about the dangers of xenobiology outbreaks."
/datum/poster/bay_62
/singleton/poster_design/science/bay_62
icon_state = "bsposter62"
name = "Xenobiology Division"
desc = "This one depicts a green skrell research director doing autopsy on an alien lifeform."
/datum/poster/bay_63
/singleton/poster_design/medical/bay_63
icon_state = "bsposter63"
name = "Suit Sensors"
desc = "This particular one depicts a female doctor tending to an injured crewmember. It says; \"Remember to enable your suit sensors!\"."
/datum/poster/bay_64
/singleton/poster_design/civilian/bay_64
icon_state = "bsposter64"
name = "N.S.S. Exodus"
desc = "This poster is a picture of the N.S.S. Exodus."
/datum/poster/bay_65
/singleton/poster_design/engineering/bay_65
icon_state = "bsposter65"
name = "Importance of Phoron"
desc = "A corporate morale poster showing three forms of phoron. Teaching the very basics of this really important substance."
/datum/poster/bay_67
/singleton/poster_design/lore/tcaf
icon_state = "tcflposter"
name = "Tau Ceti Foreign Legion"
desc = "A TCFL recruitment poster."
/datum/poster/bay_68
/singleton/poster_design/lore/tcaf2
icon_state = "tcflposter2"
name = "Tau Ceti Foreign Legion"
name = "Tau Ceti Foreign Legion Synthetic Benefits"
desc = "A TCFL recruitment poster showcasing the benefits Synthetics gain when enlisting."
code/game/objects/effects/decals/posters/poster_subtypes.dm
+493
View File
@@ -0,0 +1,493 @@
// Random Subtypes //
// Selects a design based on defined categories
// name and icon_state updated on mapload
/// Spawns a random poster. Use `random_type` for specification instead of usual methods
/obj/random/poster
icon_state = "poster"
/// This is what is primarily used to pick random posters.
/// Set this to a `/obj/structure/sign/poster/...` to specify subtype
var/random_type = /obj/structure/sign/poster
/obj/random/poster/spawn_item()
var/obj/structure/sign/poster/P = pick(subtypesof(random_type))
. = new P(loc)
/// Spawns a random rolled-up poster. Use `random_type` for specification instead of usual methods
/obj/random/poster_roll
icon_state = "rolled_poster"
/// This is what is primarily used to pick random posters.
/// Set this to a `/obj/item/contraband/poster/...` to specify subtype
var/random_type = /obj/item/contraband/poster
/obj/random/poster_roll/spawn_item()
var/obj/item/contraband/poster/P = pick(subtypesof(random_type))
. = new P(loc)
/obj/random/poster/civilian
random_type = /obj/structure/sign/poster/civilian
/obj/random/poster_roll/civilian
random_type = /obj/item/contraband/poster/civilian
/obj/random/poster/pinup
random_type = /obj/structure/sign/poster/pinup
/obj/random/poster_roll/pinup
random_type = /obj/item/contraband/poster/pinup
/obj/random/poster/command
random_type = /obj/structure/sign/poster/command
/obj/random/poster_roll/command
random_type = /obj/item/contraband/poster/command
/obj/random/poster/security
random_type = /obj/structure/sign/poster/security
/obj/random/poster_roll/security
random_type = /obj/item/contraband/poster/security
/obj/random/poster/medical
random_type = /obj/item/contraband/poster/medical
/obj/random/poster_roll/medical
random_type = /obj/item/contraband/poster/medical
/obj/random/poster/engineering
random_type = /obj/structure/sign/poster/engineering
/obj/random/poster_roll/engineering
random_type = /obj/item/contraband/poster/engineering
/// It is not recommended to use this as this may result in picking posters that do not match the setting
/obj/random/poster/lore
random_type = /obj/structure/sign/poster/lore
/// It is not recommended to use this as this may result in picking posters that do not match the setting
/obj/random/poster_roll/lore
random_type = /obj/item/contraband/poster/lore
// Poster Subtypes //
/obj/structure/sign/poster/civilian/bay_1
icon_state = "bsposter1"
poster_type = /singleton/poster_design/civilian/bay_1
/obj/item/contraband/poster/civilian/bay_1
poster_type = /singleton/poster_design/civilian/bay_1
/obj/structure/sign/poster/pinup/bay_8
icon_state = "bsposter8"
poster_type = /singleton/poster_design/pinup/bay_8
/obj/item/contraband/poster/pinup/bay_8
poster_type = /singleton/poster_design/pinup/bay_8
/obj/structure/sign/poster/pinup/bay_9
icon_state = "bsposter9"
poster_type = /singleton/poster_design/pinup/bay_8
/obj/item/contraband/poster/pinup/bay_9
poster_type = /singleton/poster_design/pinup/bay_9
/obj/structure/sign/poster/civilian/bay_16
icon_state = "bsposter16"
poster_type = /singleton/poster_design/civilian/bay_16
/obj/item/contraband/poster/civilian/bay_16
poster_type = /singleton/poster_design/civilian/bay_16
/obj/structure/sign/poster/pinup/bay_17
icon_state = "bsposter17"
poster_type = /singleton/poster_design/pinup/bay_17
/obj/item/contraband/poster/pinup/bay_17
poster_type = /singleton/poster_design/pinup/bay_17
/obj/structure/sign/poster/civilian/bay_19
icon_state = "bsposter19"
poster_type = /singleton/poster_design/civilian/bay_19
/obj/item/contraband/poster/civilian/bay_19
poster_type = /singleton/poster_design/civilian/bay_19
/obj/structure/sign/poster/civilian/bay_20
icon_state = "bsposter20"
poster_type = /singleton/poster_design/civilian/bay_20
/obj/item/contraband/poster/civilian/bay_20
poster_type = /singleton/poster_design/civilian/bay_20
/obj/structure/sign/poster/security/bay_21
icon_state = "bsposter21"
poster_type = /singleton/poster_design/security/bay_21
/obj/item/contraband/poster/security/bay_21
poster_type = /singleton/poster_design/security/bay_21
/obj/structure/sign/poster/science/bay_22
icon_state = "bsposter22"
poster_type = /singleton/poster_design/science/bay_22
/obj/item/contraband/poster/science/bay_22
poster_type = /singleton/poster_design/science/bay_22
/obj/structure/sign/poster/engineering/bay_23
icon_state = "bsposter23"
poster_type = /singleton/poster_design/engineering/bay_23
/obj/item/contraband/poster/engineering/bay_23
poster_type = /singleton/poster_design/engineering/bay_23
/obj/structure/sign/poster/medical/bay_24
icon_state = "bsposter24"
poster_type = /singleton/poster_design/medical/bay_24
/obj/item/contraband/poster/medical/bay_24
poster_type = /singleton/poster_design/medical/bay_24
/obj/structure/sign/poster/medical/bay_25
icon_state = "bsposter25"
poster_type = /singleton/poster_design/medical/bay_25
/obj/item/contraband/poster/medical/bay_25
poster_type = /singleton/poster_design/medical/bay_25
/obj/structure/sign/poster/civilian/bay_26
icon_state = "bsposter26"
poster_type = /singleton/poster_design/civilian/bay_26
/obj/item/contraband/poster/civilian/bay_26
poster_type = /singleton/poster_design/civilian/bay_26
/obj/structure/sign/poster/civilian/bay_27
icon_state = "bsposter27"
poster_type = /singleton/poster_design/civilian/bay_27
/obj/item/contraband/poster/civilian/bay_27
poster_type = /singleton/poster_design/civilian/bay_27
/obj/structure/sign/poster/civilian/bay_28
icon_state = "bsposter28"
poster_type = /singleton/poster_design/civilian/bay_28
/obj/item/contraband/poster/civilian/bay_28
poster_type = /singleton/poster_design/civilian/bay_28
/obj/structure/sign/poster/civilian/bay_30
icon_state = "bsposter30"
poster_type = /singleton/poster_design/civilian/bay_30
/obj/item/contraband/poster/civilian/bay_30
poster_type = /singleton/poster_design/civilian/bay_30
/obj/structure/sign/poster/civilian/bay_31
icon_state = "bsposter31"
poster_type = /singleton/poster_design/civilian/bay_31
/obj/item/contraband/poster/civilian/bay_31
poster_type = /singleton/poster_design/civilian/bay_31
/obj/structure/sign/poster/civilian/bay_32
icon_state = "bsposter32"
poster_type = /singleton/poster_design/civilian/bay_32
/obj/item/contraband/poster/civilian/bay_32
poster_type = /singleton/poster_design/civilian/bay_32
/obj/structure/sign/poster/engineering/bay_33
icon_state = "bsposter33"
poster_type = /singleton/poster_design/engineering/bay_33
/obj/item/contraband/poster/engineering/bay_33
poster_type = /singleton/poster_design/engineering/bay_33
/obj/structure/sign/poster/engineering/bay_34
icon_state = "bsposter34"
poster_type = /singleton/poster_design/engineering/bay_34
/obj/item/contraband/poster/engineering/bay_34
poster_type = /singleton/poster_design/engineering/bay_34
/obj/structure/sign/poster/civilian/bay_36
icon_state = "bsposter36"
poster_type = /singleton/poster_design/civilian/bay_36
/obj/item/contraband/poster/civilian/bay_36
poster_type = /singleton/poster_design/civilian/bay_36
/obj/structure/sign/poster/civilian/bay_37
icon_state = "bsposter37"
poster_type = /singleton/poster_design/civilian/bay_37
/obj/item/contraband/poster/civilian/bay_37
poster_type = /singleton/poster_design/civilian/bay_37
/obj/structure/sign/poster/civilian/bay_38
icon_state = "bsposter38"
poster_type = /singleton/poster_design/civilian/bay_38
/obj/item/contraband/poster/civilian/bay_38
poster_type = /singleton/poster_design/civilian/bay_38
/obj/structure/sign/poster/medical/bay_39
icon_state = "bsposter39"
poster_type = /singleton/poster_design/medical/bay_39
/obj/item/contraband/poster/medical/bay_39
poster_type = /singleton/poster_design/medical/bay_39
/obj/structure/sign/poster/command/bay_40
icon_state = "bsposter40"
poster_type = /singleton/poster_design/command/bay_40
/obj/item/contraband/poster/command/bay_40
poster_type = /singleton/poster_design/command/bay_40
/obj/structure/sign/poster/command/bay_41
icon_state = "bsposter41"
poster_type = /singleton/poster_design/command/bay_41
/obj/item/contraband/poster/command/bay_41
poster_type = /singleton/poster_design/command/bay_41
/obj/structure/sign/poster/pinup/bay_42
icon_state = "bsposter42"
poster_type = /singleton/poster_design/pinup/bay_42
/obj/item/contraband/poster/pinup/bay_42
poster_type = /singleton/poster_design/pinup/bay_42
/obj/structure/sign/poster/medical/bay_43
icon_state = "bsposter43"
poster_type = /singleton/poster_design/medical/bay_43
/obj/item/contraband/poster/medical/bay_43
poster_type = /singleton/poster_design/medical/bay_43
/obj/structure/sign/poster/civilian/bay_44
icon_state = "bsposter44"
poster_type = /singleton/poster_design/civilian/bay_44
/obj/item/contraband/poster/civilian/bay_44
poster_type = /singleton/poster_design/civilian/bay_44
/obj/structure/sign/poster/engineering/bay_45
icon_state = "bsposter45"
poster_type = /singleton/poster_design/engineering/bay_45
/obj/item/contraband/poster/engineering/bay_45
poster_type = /singleton/poster_design/engineering/bay_45
/obj/structure/sign/poster/pinup/bay_47
icon_state = "bsposter47"
poster_type = /singleton/poster_design/pinup/bay_47
/obj/item/contraband/poster/pinup/bay_47
poster_type = /singleton/poster_design/pinup/bay_47
/obj/structure/sign/poster/pinup/bay_48
icon_state = "bsposter48"
poster_type = /singleton/poster_design/pinup/bay_48
/obj/item/contraband/poster/pinup/bay_48
poster_type = /singleton/poster_design/pinup/bay_48
/obj/structure/sign/poster/engineering/bay_49
icon_state = "bsposter49"
poster_type = /singleton/poster_design/engineering/bay_49
/obj/item/contraband/poster/engineering/bay_49
poster_type = /singleton/poster_design/engineering/bay_49
/obj/structure/sign/poster/civilian/bay_51
icon_state = "bsposter51"
poster_type = /singleton/poster_design/civilian/bay_51
/obj/item/contraband/poster/civilian/bay_51
poster_type = /singleton/poster_design/civilian/bay_51
/obj/structure/sign/poster/engineering/bay_52
icon_state = "bsposter52"
poster_type = /singleton/poster_design/engineering/bay_52
/obj/item/contraband/poster/engineering/bay_52
poster_type = /singleton/poster_design/engineering/bay_52
/obj/structure/sign/poster/engineering/bay_53
icon_state = "bsposter53"
poster_type = /singleton/poster_design/engineering/bay_53
/obj/item/contraband/poster/engineering/bay_53
poster_type = /singleton/poster_design/engineering/bay_53
/obj/structure/sign/poster/engineering/bay_54
icon_state = "bsposter54"
poster_type = /singleton/poster_design/engineering/bay_54
/obj/item/contraband/poster/engineering/bay_54
poster_type = /singleton/poster_design/engineering/bay_54
/obj/structure/sign/poster/civilian/bay_55
icon_state = "bsposter55"
poster_type = /singleton/poster_design/civilian/bay_55
/obj/item/contraband/poster/civilian/bay_55
poster_type = /singleton/poster_design/civilian/bay_55
/obj/structure/sign/poster/civilian/bay_56
icon_state = "bsposter56"
poster_type = /singleton/poster_design/civilian/bay_56
/obj/item/contraband/poster/civilian/bay_56
poster_type = /singleton/poster_design/civilian/bay_56
/obj/structure/sign/poster/civilian/bay_57
icon_state = "bsposter57"
poster_type = /singleton/poster_design/civilian/bay_57
/obj/item/contraband/poster/civilian/bay_57
poster_type = /singleton/poster_design/civilian/bay_57
/obj/structure/sign/poster/civilian/bay_58
icon_state = "bsposter58"
poster_type = /singleton/poster_design/civilian/bay_58
/obj/item/contraband/poster/civilian/bay_58
poster_type = /singleton/poster_design/civilian/bay_58
/obj/structure/sign/poster/civilian/bay_60
icon_state = "bsposter60"
poster_type = /singleton/poster_design/civilian/bay_60
/obj/item/contraband/poster/civilian/bay_60
poster_type = /singleton/poster_design/civilian/bay_60
/obj/structure/sign/poster/science/bay_61
icon_state = "bsposter61"
poster_type = /singleton/poster_design/science/bay_61
/obj/item/contraband/poster/science/bay_61
poster_type = /singleton/poster_design/science/bay_61
/obj/structure/sign/poster/science/bay_62
icon_state = "bsposter62"
poster_type = /singleton/poster_design/science/bay_62
/obj/item/contraband/poster/science/bay_62
poster_type = /singleton/poster_design/science/bay_62
/obj/structure/sign/poster/medical/bay_63
icon_state = "bsposter63"
poster_type = /singleton/poster_design/medical/bay_63
/obj/item/contraband/poster/medical/bay_63
poster_type = /singleton/poster_design/medical/bay_63
/obj/structure/sign/poster/civilian/bay_64
icon_state = "bsposter64"
poster_type = /singleton/poster_design/civilian/bay_64
/obj/item/contraband/poster/civilian/bay_64
poster_type = /singleton/poster_design/civilian/bay_64
/obj/structure/sign/poster/engineering/bay_65
icon_state = "bsposter65"
poster_type = /singleton/poster_design/engineering/bay_65
/obj/item/contraband/poster/engineering/bay_65
poster_type = /singleton/poster_design/engineering/bay_65
/obj/structure/sign/poster/lore/tcaf
icon_state = "tcflposter"
poster_type = /singleton/poster_design/lore/tcaf
/obj/item/contraband/poster/lore/tcaf
poster_type = /singleton/poster_design/lore/tcaf
/obj/structure/sign/poster/lore/tcaf2
icon_state = "tcflposter2"
poster_type = /singleton/poster_design/lore/tcaf2
/obj/item/contraband/poster/lore/tcaf2
poster_type = /singleton/poster_design/lore/tcaf2
/obj/structure/sign/poster/security/tg_5
icon_state = "poster5"
poster_type = /singleton/poster_design/security/tg_5
/obj/item/contraband/poster/security/tg_5
poster_type = /singleton/poster_design/security/tg_5
/obj/structure/sign/poster/civilian/tg_7
icon_state = "poster7"
poster_type = /singleton/poster_design/civilian/tg_7
/obj/item/contraband/poster/civilian/tg_7
poster_type = /singleton/poster_design/civilian/tg_7
/obj/structure/sign/poster/engineering/tg_10
icon_state = "poster10"
poster_type = /singleton/poster_design/engineering/tg_10
/obj/item/contraband/poster/engineering/tg_10
poster_type = /singleton/poster_design/engineering/tg_10
code/game/objects/effects/decals/posters/tgposters.dm
+4 -4
View File
@@ -1,16 +1,16 @@
// /tg/ posters.
/datum/poster/tg_5
name = "PMC Recruitment Poster"
/singleton/poster_design/security/tg_5
name = "PMCG Recruitment Poster"
desc = "See the galaxy! Earn a living! Join today!"
icon_state="poster5"
/datum/poster/tg_7
/singleton/poster_design/civilian/tg_7
name = "Smoke"
desc = "A poster advertising cigarettes."
icon_state="poster7"
/datum/poster/tg_10
/singleton/poster_design/engineering/tg_10
name = "Access Panel Diagram"
desc = "This poster details the internal workings of a typical airlock's access panel."
icon_state="poster10"
code/game/objects/random/loot.dm
+1 -1
View File
@@ -323,7 +323,7 @@
/obj/random/contraband
name = "random contraband"
desc = "This is some random contraband."
icon_state = "knife"
icon_state = "need_sprite"
problist = list(
/obj/item/storage/pill_bottle/mortaphenyl = 3,
/obj/item/storage/pill_bottle/happy = 2,