diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index a5eb8de1a336..f61e232802ab 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -2593,7 +2593,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "hr" = ( -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "hs" = ( diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 3e1adb953bd7..8cdb03f15fb6 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -439,19 +439,19 @@ /obj/machinery/door/poddoor/shutters{ id = "AcademyAuto" }, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "bu" = ( /obj/machinery/door/poddoor/shutters{ id = "AcademyAuto" }, -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plating, /area/awaymission/academy/classrooms) "bv" = ( /obj/machinery/door/poddoor/shutters{ @@ -463,10 +463,10 @@ /obj/machinery/door/poddoor/shutters{ id = "AcademyAuto" }, -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plating, /area/awaymission/academy/classrooms) "bx" = ( /turf/open/floor/plasteel/chapel{ @@ -482,19 +482,19 @@ /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "bA" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plating, /area/awaymission/academy/classrooms) "bB" = ( /turf/open/floor/plating, /area/awaymission/academy/classrooms) "bC" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plating, /area/awaymission/academy/classrooms) "bD" = ( /obj/machinery/button/door{ @@ -865,10 +865,10 @@ /turf/open/floor/plating, /area/awaymission/academy/classrooms) "cK" = ( -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "cL" = ( /obj/structure/chair{ @@ -886,16 +886,16 @@ /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "cN" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/turf/open/floor/plating, /area/awaymission/academy/classrooms) "cO" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/turf/open/floor/plating, /area/awaymission/academy/classrooms) "cP" = ( /turf/open/floor/plasteel/red/side{ @@ -1450,10 +1450,10 @@ /turf/open/floor/plasteel/white, /area/awaymission/academy/classrooms) "ez" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/turf/open/floor/plating, /area/awaymission/academy) "eA" = ( /obj/machinery/door/airlock/glass, @@ -1512,10 +1512,10 @@ }, /area/awaymission/academy/classrooms) "eJ" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plating, /area/awaymission/academy) "eK" = ( /turf/open/floor/plasteel/yellow/side{ @@ -1625,10 +1625,10 @@ }, /area/awaymission/academy/classrooms) "fb" = ( -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/turf/open/floor/plating, /area/awaymission/academy) "fc" = ( /obj/structure/window/reinforced, @@ -1919,10 +1919,10 @@ icon_state = "4-8"; pixel_y = 0 }, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "fI" = ( /obj/structure/cable{ @@ -1977,25 +1977,25 @@ /turf/open/floor/plasteel/vault, /area/awaymission/academy/classrooms) "fR" = ( -/mob/living/simple_animal/hostile/wizard, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/mob/living/simple_animal/hostile/wizard, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "fS" = ( /obj/structure/window/reinforced, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaymission/academy/classrooms) "fT" = ( /obj/structure/table/reinforced, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "fU" = ( /obj/item/target, @@ -2033,10 +2033,10 @@ /turf/open/floor/plating, /area/awaymission/academy/classrooms) "ga" = ( -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "gb" = ( /obj/structure/table, @@ -2128,10 +2128,10 @@ /obj/machinery/door/window{ dir = 4 }, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "go" = ( /obj/item/weapon/storage/box/monkeycubes, @@ -2228,10 +2228,10 @@ dir = 4 }, /obj/item/ammo_casing, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "gB" = ( /obj/machinery/light/small, @@ -2306,10 +2306,10 @@ "gK" = ( /obj/structure/window/reinforced, /obj/item/ammo_casing, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaymission/academy/classrooms) "gL" = ( /mob/living/simple_animal/hostile/bear, @@ -2330,10 +2330,10 @@ }, /area/awaymission/academy/classrooms) "gP" = ( -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "gQ" = ( /obj/machinery/light/small{ @@ -2427,10 +2427,10 @@ d2 = 8; icon_state = "0-8" }, -/turf/open/floor/plasteel, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "ha" = ( /turf/open/floor/plasteel/white/side{ @@ -2859,7 +2859,7 @@ /obj/structure/closet, /obj/item/weapon/reagent_containers/food/drinks/beer, /obj/item/clothing/under/color/lightpurple, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "ic" = ( @@ -3806,10 +3806,10 @@ /obj/machinery/door/poddoor/shutters{ id = "AcademyGate" }, -/turf/open/floor/plating, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/turf/open/floor/plating, /area/awaymission/academy/academygate) "kz" = ( /mob/living/simple_animal/hostile/wizard, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 96cb32a4e1ba..2ad6bc5eb534 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -825,10 +825,8 @@ }) "be" = ( /obj/machinery/vending/cigarette, -/obj/structure/sign/poster{ - icon_state = "poster7"; - pixel_y = 32; - serial_number = 7 +/obj/structure/sign/poster/contraband/smoke{ + pixel_y = 32 }, /turf/open/floor/plasteel/black, /area/awaycontent/a4{ @@ -930,13 +928,10 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/sign/poster{ - icon_state = "poster17"; - pixel_x = -32; - pixel_y = 0; - serial_number = 17 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/space_cube{ + pixel_x = -32 + }, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -1484,11 +1479,8 @@ /obj/structure/alien/weeds{ icon_state = "weeds1" }, -/obj/structure/sign/poster{ - icon_state = "poster5"; - pixel_x = 0; - pixel_y = 32; - serial_number = 5 +/obj/structure/sign/poster/contraband/syndicate_recruitment{ + pixel_y = 32 }, /turf/open/floor/plasteel/loadingarea{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -1702,15 +1694,12 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/sign/poster{ - icon_state = "poster10"; - pixel_x = 32; - pixel_y = 0; - serial_number = 10 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/sign/poster/contraband/hacking_guide{ + pixel_x = 32 + }, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -2542,17 +2531,14 @@ }) "dq" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - icon_state = "poster24"; - pixel_x = 0; - pixel_y = -32; - serial_number = 24 - }, /obj/item/weapon/pen, /obj/item/weapon/paper{ info = "Log 1:
While mining today I noticed the NT station was finished with its renovations. They placed some huge reinforced tumor on the station, looks so ugly. I wouldn't be surprised if those pigs decided to turn that little astronomy outpost into a prison with that thing, it'd be pretty typical of them.

Log 2:
Really dumb of me but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't then we might have to pull out before they come looking for us.

Log 3:
That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on."; name = "Personal Log" }, +/obj/structure/sign/poster/contraband/c20r{ + pixel_y = -32 + }, /turf/open/floor/wood{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -3750,11 +3736,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/sign/poster{ - icon_state = "poster5_legit"; - pixel_x = 0; - pixel_y = 32; - serial_number = 21 +/obj/structure/sign/poster/official/build{ + pixel_y = 32 }, /turf/open/floor/plating{ heat_capacity = 1e+006 @@ -4606,15 +4589,13 @@ name = "MO19 Research" }) "fU" = ( -/obj/structure/sign/poster{ - icon_state = "poster21_legit"; - pixel_y = 32; - serial_number = 21 - }, /obj/item/device/radio/off, /obj/item/weapon/screwdriver{ pixel_y = 10 }, +/obj/structure/sign/poster/official/safety_report{ + pixel_y = 32 + }, /turf/open/floor/plasteel/red/side{ dir = 5; heat_capacity = 1e+006 @@ -6007,7 +5988,7 @@ "hK" = ( /obj/structure/closet/crate, /obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating{ broken = 1; heat_capacity = 1e+006; @@ -7174,11 +7155,8 @@ }) "jw" = ( /obj/machinery/vending/snack, -/obj/structure/sign/poster{ - icon_state = "poster14"; - pixel_x = 0; - pixel_y = 32; - serial_number = 14 +/obj/structure/sign/poster/contraband/eat{ + pixel_y = 32 }, /turf/open/floor/plasteel{ burnt = 1; @@ -7936,11 +7914,8 @@ name = "MO19 Arrivals" }) "kx" = ( -/obj/structure/sign/poster{ - icon_state = "poster2_legit"; - pixel_x = 0; - pixel_y = -32; - serial_number = 2 +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 }, /turf/open/floor/plasteel/arrival{ dir = 2; @@ -9233,10 +9208,8 @@ }) "mC" = ( /obj/machinery/vending/cigarette, -/obj/structure/sign/poster{ - icon_state = "poster7"; - pixel_y = -32; - serial_number = 7 +/obj/structure/sign/poster/contraband/smoke{ + pixel_y = -32 }, /turf/open/floor/plasteel/black, /area/awaycontent/a1{ diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index 8fb62f253dc9..df0ed07de0a9 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -1872,7 +1872,7 @@ /area/awaymission/spacebattle/cruiser) "gc" = ( /obj/structure/closet/crate, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "gd" = ( diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 5d45e81aa936..244d9d1177df 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -201,22 +201,22 @@ /obj/machinery/door/poddoor{ id = "UO45_Elevator" }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ heat_capacity = 1e+006; name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" }) "at" = ( -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" @@ -374,11 +374,8 @@ name = "UO45 Central Hall" }) "aH" = ( -/obj/structure/sign/poster{ - icon_state = "poster2_legit"; - pixel_x = 0; - pixel_y = 32; - serial_number = 2 +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = 32 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -409,11 +406,8 @@ "aK" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, -/obj/structure/sign/poster{ - icon_state = "poster19_legit"; - pixel_x = -32; - pixel_y = 0; - serial_number = 19 +/obj/structure/sign/poster/official/safety_internals{ + pixel_x = -32 }, /turf/open/floor/plasteel/black{ heat_capacity = 1e+006 @@ -1024,11 +1018,8 @@ name = "UO45 Central Hall" }) "bK" = ( -/obj/structure/sign/poster{ - icon_state = "poster2_legit"; - pixel_x = 0; - pixel_y = -32; - serial_number = 2 +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -1056,13 +1047,10 @@ name = "UO45 Central Hall" }) "bN" = ( -/obj/structure/sign/poster{ - icon_state = "poster2_legit"; - pixel_x = 0; - pixel_y = -32; - serial_number = 2 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -1892,7 +1880,7 @@ dir = 5 }, /obj/structure/closet, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -3162,10 +3150,8 @@ /obj/item/weapon/screwdriver{ pixel_y = 10 }, -/obj/structure/sign/poster{ - icon_state = "poster21_legit"; - pixel_y = -32; - serial_number = 21 +/obj/structure/sign/poster/official/safety_report{ + pixel_y = -32 }, /turf/open/floor/plasteel/red/side{ heat_capacity = 1e+006 @@ -3677,13 +3663,10 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/sign/poster{ - icon_state = "poster14"; - pixel_x = 32; - pixel_y = 0; - serial_number = 14 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/eat{ + pixel_x = 32 + }, /turf/open/floor/plasteel/green/corner{ dir = 4; heat_capacity = 1e+006 @@ -4847,47 +4830,47 @@ }) "hB" = ( /obj/machinery/r_n_d/destructive_analyzer, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" }) "hC" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" }) "hD" = ( /obj/machinery/r_n_d/protolathe, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" }) "hE" = ( -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -5467,12 +5450,12 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -5485,12 +5468,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -5502,12 +5485,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -5519,12 +5502,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -6266,24 +6249,24 @@ }) "jF" = ( /obj/structure/closet/l3closet/scientist, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" }) "jG" = ( /obj/structure/closet/l3closet/scientist, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -6414,11 +6397,8 @@ "jR" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, -/obj/structure/sign/poster{ - icon_state = "poster19_legit"; - pixel_x = 0; - pixel_y = 32; - serial_number = 19 +/obj/structure/sign/poster/official/safety_internals{ + pixel_y = 32 }, /turf/open/floor/plasteel{ burnt = 1; @@ -6926,12 +6906,12 @@ }, /obj/item/device/assembly/prox_sensor, /obj/item/device/assembly/prox_sensor, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -6951,12 +6931,12 @@ "kA" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -6968,12 +6948,12 @@ scrub_N2O = 0; scrub_Toxins = 0 }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -6985,12 +6965,12 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -7284,11 +7264,11 @@ id = "UO45_biohazard"; name = "biohazard containment door" }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ heat_capacity = 1e+006; name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -7301,23 +7281,23 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/space) "la" = ( /obj/machinery/shower{ pixel_y = 15 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -7326,12 +7306,12 @@ /obj/structure/sink{ pixel_y = 25 }, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -7508,12 +7488,12 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -8178,12 +8158,12 @@ }) "lZ" = ( /obj/machinery/suit_storage_unit/engine, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -8199,12 +8179,12 @@ pixel_x = 3; pixel_y = -7 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -8337,12 +8317,12 @@ }) "ml" = ( /obj/structure/closet/firecloset, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -8355,24 +8335,24 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" }) "mn" = ( /obj/structure/closet/emcloset, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/turf/open/floor/plasteel/white{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -8578,23 +8558,23 @@ /obj/item/device/flashlight, /obj/item/device/flashlight, /obj/item/device/flashlight, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" }) "mC" = ( -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -8609,12 +8589,12 @@ layer = 2.9 }, /obj/item/weapon/tank/jetpack/carbondioxide, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -8637,12 +8617,12 @@ layer = 2.9 }, /obj/item/clothing/shoes/magboots, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -8658,36 +8638,36 @@ layer = 2.9 }, /obj/item/clothing/shoes/magboots, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" }) "mG" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" }) "mH" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a6{ has_gravity = 1; name = "UO45 Gateway" @@ -9309,10 +9289,8 @@ }) "nz" = ( /obj/machinery/vending/cigarette, -/obj/structure/sign/poster{ - icon_state = "poster7"; - pixel_y = 32; - serial_number = 7 +/obj/structure/sign/poster/contraband/smoke{ + pixel_y = 32 }, /turf/open/floor/plasteel/black{ heat_capacity = 1e+006 @@ -9437,12 +9415,12 @@ d2 = 4; icon_state = "2-4" }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/corner{ dir = 2 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -9464,12 +9442,12 @@ icon_state = "4-8"; pixel_x = 0 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -9480,12 +9458,12 @@ d2 = 8; icon_state = "2-8" }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -10119,12 +10097,12 @@ icon_state = "1-2"; pixel_y = 0 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -10168,12 +10146,12 @@ icon_state = "1-2"; pixel_y = 0 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -10526,12 +10504,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -10611,12 +10589,12 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -10988,12 +10966,12 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -11008,12 +10986,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -11033,12 +11011,12 @@ icon_state = "intact"; dir = 10 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -11050,12 +11028,12 @@ icon_state = "4-8"; pixel_x = 0 }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -11066,12 +11044,12 @@ d2 = 8; icon_state = "1-8" }, -/turf/open/floor/plasteel/black{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/turf/open/floor/plasteel/black{ + heat_capacity = 1e+006 + }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -11960,26 +11938,26 @@ initialize_directions = 10 }, /obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" }) "qN" = ( /obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -12526,13 +12504,13 @@ "rx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -12605,7 +12583,7 @@ "rD" = ( /obj/structure/closet/crate, /obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ burnt = 1; @@ -14670,13 +14648,13 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -14835,12 +14813,12 @@ }) "us" = ( /obj/structure/closet/firecloset, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -14850,12 +14828,12 @@ icon_state = "manifold"; dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -14867,12 +14845,12 @@ }, /obj/structure/table/reinforced, /obj/item/weapon/wrench, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -15064,12 +15042,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -15089,12 +15067,12 @@ /obj/machinery/atmospherics/components/binary/valve{ dir = 2 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -15302,11 +15280,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ heat_capacity = 1e+006; name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -15326,11 +15304,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ heat_capacity = 1e+006; name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -15345,11 +15323,11 @@ name = "engineering security door" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ heat_capacity = 1e+006; name = "floor" }, -/obj/effect/turf_decal/delivery, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -15412,12 +15390,12 @@ }) "vh" = ( /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -15427,10 +15405,10 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating{ heat_capacity = 1e+006 }, -/obj/effect/turf_decal/stripes/line, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -15440,12 +15418,12 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a5{ has_gravity = 1; name = "UO45 Research" @@ -15965,11 +15943,8 @@ dir = 4 }, /obj/machinery/vending/tool, -/obj/structure/sign/poster{ - icon_state = "poster5_legit"; - pixel_x = 0; - pixel_y = -32; - serial_number = 21 +/obj/structure/sign/poster/official/build{ + pixel_y = -32 }, /turf/open/floor/plasteel{ burnt = 1; @@ -16014,13 +15989,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -16030,13 +16005,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -16046,13 +16021,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/effect/turf_decal/bot{ + dir = 2 + }, /turf/open/floor/plasteel{ dir = 2; heat_capacity = 1e+006 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, /area/awaycontent/a3{ has_gravity = 1; name = "UO45 Engineering" @@ -16953,12 +16928,12 @@ dir = 2; id = "UO45_mining" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -16970,12 +16945,12 @@ input_dir = 4; output_dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -17029,12 +17004,12 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -17102,12 +17077,12 @@ dir = 1; output_dir = 2 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -17221,12 +17196,12 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -17436,12 +17411,12 @@ input_dir = 8; output_dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/plating{ + heat_capacity = 1e+006 + }, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -17559,20 +17534,20 @@ }) "yc" = ( /obj/structure/ore_box, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, -/obj/effect/turf_decal/stripes/line, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" }) "yd" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, -/obj/effect/turf_decal/stripes/line, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" @@ -17590,10 +17565,10 @@ pixel_y = 0 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, -/obj/effect/turf_decal/stripes/line, /area/awaycontent/a4{ has_gravity = 1; name = "UO45 Mining" diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2e777cac4400..8a01d56856e1 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2624,7 +2624,7 @@ /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -4127,10 +4127,8 @@ /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 }, /turf/open/floor/carpet, /area/security/vacantoffice) @@ -4539,11 +4537,8 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster16_legit" +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = -32 }, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) @@ -4854,7 +4849,7 @@ }, /area/maintenance/starboard/fore_starboard_maintenance) "ajH" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/starboard/fore_starboard_maintenance) "ajI" = ( @@ -4943,13 +4938,13 @@ /obj/structure/sign/barsign{ pixel_y = 32 }, -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/item/weapon/wirerod, /obj/item/weapon/wrench, /obj/item/clothing/under/waiter, /obj/item/clothing/tie/waistcoat, +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel/black, /area/crew_quarters/electronic_marketing_den) "ajR" = ( @@ -5424,15 +5419,15 @@ /area/crew_quarters/electronic_marketing_den) "akY" = ( /obj/structure/table/wood, -/obj/item/weapon/poster/contraband{ +/obj/item/weapon/poster/random_contraband{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/contraband{ +/obj/item/weapon/poster/random_contraband{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "akZ" = ( @@ -6594,11 +6589,8 @@ "anp" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light/small, -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster17_legit" +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 }, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) @@ -7038,15 +7030,15 @@ /area/crew_quarters/electronic_marketing_den) "aod" = ( /obj/structure/table/wood, -/obj/item/weapon/poster/contraband{ +/obj/item/weapon/poster/random_contraband{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/contraband{ +/obj/item/weapon/poster/random_contraband{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plasteel/black, /area/crew_quarters/electronic_marketing_den) "aoe" = ( @@ -7388,7 +7380,7 @@ name = "Atmospherics Engine" }) "aoM" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/crew_quarters/electronic_marketing_den) "aoN" = ( @@ -8859,7 +8851,7 @@ name = "Atmospherics Engine" }) "aro" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/fpmaint2/fore_port_maintenance) "arp" = ( @@ -10881,7 +10873,7 @@ /area/maintenance/fpmaint2/fore_port_maintenance) "auX" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/wood{ @@ -10957,13 +10949,10 @@ /area/janitor) "avf" = ( /obj/structure/janitorialcart, -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster17_legit" - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_x = 32 + }, /turf/open/floor/plating, /area/janitor) "avg" = ( @@ -11471,10 +11460,10 @@ /turf/open/floor/plasteel/neutral/side, /area/maintenance/fpmaint2/fore_port_maintenance) "avZ" = ( -/obj/structure/sign/poster{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redblue, /area/maintenance/fpmaint2/fore_port_maintenance) "awa" = ( @@ -11491,12 +11480,12 @@ /area/maintenance/fpmaint2/fore_port_maintenance) "awb" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/shoes/jackboots, /obj/effect/landmark/costume, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/cafeteria, /area/maintenance/fpmaint2/fore_port_maintenance) "awc" = ( @@ -11535,12 +11524,6 @@ icon_state = "sink"; pixel_x = -12 }, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, @@ -11554,6 +11537,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/small, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, /turf/open/floor/plasteel/neutral, /area/janitor) "awf" = ( @@ -14600,7 +14586,7 @@ /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "aBB" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/bar) "aBC" = ( @@ -16219,10 +16205,10 @@ /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "aEc" = ( -/obj/structure/sign/poster, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/bar) "aEd" = ( @@ -17574,17 +17560,14 @@ "aGx" = ( /obj/structure/closet/radiation, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/machinery/camera{ c_tag = "Atmospherics - Engine Access"; name = "atmospherics camera" }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator{ name = "Atmospherics Engine" @@ -19244,10 +19227,10 @@ /area/crew_quarters/bar/atrium) "aJu" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ +/obj/item/weapon/soap/nanotrasen, +/obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/item/weapon/soap/nanotrasen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -19275,12 +19258,12 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) "aJw" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/structure/easel, /obj/item/weapon/canvas/twentythreeXtwentythree, /obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) "aJx" = ( @@ -19470,14 +19453,12 @@ /obj/machinery/door/airlock{ name = "Bathroom" }, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_y = 32; - tag = "icon-poster3_legit" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = 32 + }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aJQ" = ( @@ -19983,7 +19964,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, /turf/open/floor/wood{ @@ -20003,13 +19984,13 @@ /area/crew_quarters/theatre) "aKM" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/item/device/instrument/eguitar, /obj/item/toy/crayon/spraycan/lubecan{ charges = 5 }, +/obj/structure/sign/poster/contraband/clown{ + pixel_y = 32 + }, /turf/open/floor/plasteel/redblue, /area/crew_quarters/theatre) "aKN" = ( @@ -20033,11 +20014,11 @@ /area/crew_quarters/theatre) "aKO" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/item/weapon/clipboard, /obj/item/toy/figure/clown, +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/redblue, /area/crew_quarters/theatre) "aKP" = ( @@ -20066,7 +20047,7 @@ name = "Service Hall" }) "aKR" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/bar/atrium) "aKS" = ( @@ -20474,13 +20455,10 @@ name = "Prisoner Education Chamber" }) "aLM" = ( -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster4_legit" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/sign/poster/official/help_others{ + pixel_x = 32 + }, /turf/open/floor/plasteel/vault, /area/prison/solitary{ name = "Prisoner Education Chamber" @@ -20852,7 +20830,7 @@ }, /area/maintenance/fpmaint2/fore_port_maintenance) "aMo" = ( -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, /turf/open/floor/plasteel/grimy, @@ -20885,10 +20863,10 @@ /area/crew_quarters/abandoned_gambling_den) "aMt" = ( /obj/machinery/computer/slot_machine, -/obj/structure/sign/poster{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ icon_state = "wood-broken4" }, @@ -23897,20 +23875,20 @@ /area/crew_quarters/abandoned_gambling_den) "aRs" = ( /obj/machinery/computer/slot_machine, -/obj/structure/sign/poster{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ icon_state = "wood-broken7" }, /area/crew_quarters/abandoned_gambling_den) "aRt" = ( /obj/machinery/computer/slot_machine, -/obj/structure/sign/poster{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "aRu" = ( @@ -23950,13 +23928,13 @@ /area/crew_quarters/theatre) "aRw" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/item/weapon/reagent_containers/food/snacks/baguette, /obj/item/toy/crayon/spraycan/mimecan{ charges = 5 }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/theatre) "aRx" = ( @@ -23977,7 +23955,7 @@ /area/crew_quarters/theatre) "aRz" = ( /obj/structure/dresser, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/plasteel/cafeteria, @@ -25032,11 +25010,11 @@ /area/crew_quarters/bar/atrium) "aTk" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/item/clothing/mask/fakemoustache, /obj/item/weapon/cane, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -25056,7 +25034,7 @@ /area/crew_quarters/bar/atrium) "aTm" = ( /obj/structure/chair/stool/bar, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = -32 }, /turf/open/floor/plasteel/grimy, @@ -28526,12 +28504,10 @@ /obj/structure/reagent_dispensers/watertank, /obj/structure/window/reinforced, /obj/item/weapon/reagent_containers/glass/bucket, -/obj/structure/sign/poster{ - icon_state = "poster2_legit"; - pixel_x = -32; - tag = "icon-poster2_legit" - }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/hydroponics) "aZD" = ( @@ -31248,10 +31224,8 @@ "beG" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_y = 32; - tag = "icon-poster3_legit" +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = 32 }, /turf/open/floor/plasteel/whitered/side{ dir = 9 @@ -32909,15 +32883,13 @@ /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bhA" = ( -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bhB" = ( @@ -33059,13 +33031,10 @@ pixel_x = -3; pixel_y = 5 }, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bhN" = ( @@ -33830,12 +33799,10 @@ "bjj" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper_bin, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/atmos) "bjk" = ( @@ -35508,12 +35475,6 @@ /turf/open/floor/plasteel/neutral, /area/atmos) "bmk" = ( -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster17_legit" - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Air to External Air Ports"; @@ -35523,6 +35484,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/atmos) "bml" = ( @@ -36895,11 +36859,6 @@ /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "boI" = ( -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -36907,6 +36866,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "boJ" = ( @@ -37034,11 +36996,6 @@ }, /area/hallway/primary/central) "boT" = ( -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = -32; - tag = "icon-poster22_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -37046,6 +37003,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = -32 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, @@ -38601,13 +38561,10 @@ icon_state = "sink"; pixel_x = -12 }, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/hydroponics) "brD" = ( @@ -39343,12 +39300,10 @@ }, /obj/item/weapon/watertank, /obj/item/weapon/grenade/chem_grenade/antiweed, -/obj/structure/sign/poster{ - icon_state = "poster8_legit"; - pixel_y = -32; - tag = "icon-poster8_legit" - }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/ian{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/hydroponics) "bsS" = ( @@ -39833,11 +39788,8 @@ name = "maint microwave"; pixel_y = 5 }, -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster4_legit" +/obj/structure/sign/poster/official/help_others{ + pixel_x = -32 }, /turf/open/floor/plasteel/redyellow, /area/engine/break_room) @@ -42448,12 +42400,10 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -43063,12 +43013,10 @@ /area/storage/primary) "bzk" = ( /obj/structure/reagent_dispensers/watertank, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" - }, /obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/storage/primary) "bzl" = ( @@ -43712,17 +43660,14 @@ /obj/structure/chair{ dir = 1 }, -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster17_legit" - }, /obj/machinery/camera{ c_tag = "Security - Transfer Centre Aft"; dir = 1; name = "security camera" }, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 + }, /turf/open/floor/plasteel/red/side, /area/security/transfer) "bzX" = ( @@ -43766,12 +43711,10 @@ name = "Brig"; req_access_txt = "63" }, -/obj/structure/sign/poster{ - icon_state = "poster2_legit"; - pixel_x = -32; - tag = "icon-poster2_legit" - }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "bAb" = ( @@ -46694,10 +46637,8 @@ /obj/structure/table/wood, /obj/item/weapon/clipboard, /obj/item/toy/figure/detective, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 }, /turf/open/floor/plasteel/vault, /area/security/detectives_office) @@ -56236,12 +56177,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bVk" = ( -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = -32; - pixel_y = -32; - tag = "icon-poster4_legit" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; icon_state = "manifold"; @@ -56251,6 +56186,10 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/sign/poster/official/help_others{ + pixel_x = -32; + pixel_y = -32 + }, /turf/open/floor/plasteel/red/corner{ dir = 8 }, @@ -56634,14 +56573,12 @@ /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/obj/structure/sign/poster{ - icon_state = "poster8_legit"; - pixel_y = -32; - tag = "icon-poster8_legit" - }, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, +/obj/structure/sign/poster/official/ian{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -58053,16 +57990,14 @@ /obj/structure/chair{ dir = 4 }, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" - }, /obj/machinery/camera{ c_tag = "Courtroom - Fore"; dir = 2; name = "security camera" }, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 + }, /turf/open/floor/plasteel/vault, /area/crew_quarters/courtroom) "bYB" = ( @@ -58269,11 +58204,11 @@ }, /obj/item/weapon/folder/red, /obj/item/weapon/pen, -/obj/item/weapon/poster/legit{ +/obj/item/weapon/poster/random_official{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/warden) @@ -61265,11 +61200,8 @@ dir = 8 }, /obj/item/weapon/pen, -/obj/structure/sign/poster{ - icon_state = "poster29_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster29_legit" +/obj/structure/sign/poster/official/enlist{ + pixel_y = -32 }, /turf/open/floor/plasteel/red/side{ dir = 10 @@ -61415,11 +61347,6 @@ /area/security/brig) "cej" = ( /obj/structure/closet/wardrobe/red, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/item/clothing/under/rank/security/grey, /obj/item/clothing/under/rank/security/grey, /obj/item/clothing/under/rank/security/grey, @@ -61428,6 +61355,9 @@ icon_state = "1-4" }, /obj/item/weapon/storage/backpack/satchel/sec, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel/red, /area/security/brig) "cek" = ( @@ -61785,10 +61715,8 @@ /area/hallway/primary/central) "ceX" = ( /obj/machinery/vending/cola/random, -/obj/structure/sign/poster{ - icon_state = "poster8_legit"; - pixel_y = -32; - tag = "icon-poster8_legit" +/obj/structure/sign/poster/official/ian{ + pixel_y = -32 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -61830,13 +61758,10 @@ /area/crew_quarters/heads) "cfc" = ( /obj/machinery/photocopier, -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster17_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/crew_quarters/heads) "cfd" = ( @@ -62119,12 +62044,10 @@ pixel_x = -3; pixel_y = 3 }, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = -32; - tag = "icon-poster22_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = -32 + }, /turf/open/floor/wood, /area/lawoffice) "cfG" = ( @@ -63126,13 +63049,10 @@ pixel_x = 0; pixel_y = -32 }, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster16_legit" - }, /obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/engine/engineering) "chC" = ( @@ -65927,11 +65847,8 @@ "cmK" = ( /obj/structure/table/wood, /obj/item/weapon/storage/briefcase, -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster4_legit" +/obj/structure/sign/poster/official/help_others{ + pixel_x = 32 }, /turf/open/floor/plasteel/vault, /area/crew_quarters/courtroom) @@ -66745,15 +66662,12 @@ }, /area/crew_quarters/courtroom) "coi" = ( -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster17_legit" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -69603,12 +69517,10 @@ /obj/item/weapon/crowbar, /obj/item/weapon/grenade/chem_grenade/metalfoam, /obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" - }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/engine/engineering{ name = "Engineering Storage" @@ -75166,11 +75078,11 @@ }, /obj/item/weapon/wrench, /obj/item/weapon/storage/box/lights/mixed, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/maintenance/fpmaint2/port_maintenance) "cCH" = ( @@ -78872,15 +78784,12 @@ /area/maintenance/fpmaint2/port_maintenance) "cJh" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = 0; - pixel_y = 32; - tag = "icon-poster4_legit" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/sign/poster/official/help_others{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/maintenance/electrical) "cJi" = ( @@ -78977,17 +78886,15 @@ dir = 1 }, /obj/structure/rack, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" - }, /obj/item/weapon/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, /obj/item/weapon/storage/toolbox/electrical, /obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/maintenance/electrical) "cJt" = ( @@ -79223,11 +79130,8 @@ /obj/structure/table, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, -/obj/structure/sign/poster{ - tag = "icon-poster7_legit"; - icon_state = "poster7_legit"; - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/official/science{ + pixel_x = -32 }, /turf/open/floor/plasteel/whitepurple/corner{ tag = "icon-whitepurplecorner (NORTH)"; @@ -82549,17 +82453,15 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_y = 32; - tag = "icon-poster3_legit" - }, /obj/machinery/light/small{ dir = 1 }, /obj/effect/landmark{ name = "blobstart" }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = 32 + }, /turf/open/floor/plasteel/neutral, /area/medical/medbay{ name = "Medbay Central" @@ -84239,15 +84141,12 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, /turf/open/floor/plasteel{ tag = "icon-plasteel_warn_side (WEST)" }, @@ -84533,13 +84432,11 @@ /area/maintenance/electrical) "cTo" = ( /obj/structure/table/reinforced, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/item/clothing/gloves/color/yellow, /obj/item/weapon/storage/toolbox/electrical, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plating, /area/maintenance/electrical) "cTp" = ( @@ -86164,13 +86061,10 @@ /turf/open/floor/plating, /area/security/checkpoint/medical) "cWc" = ( -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster4_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/poster/official/help_others{ + pixel_x = -32 + }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, @@ -87867,12 +87761,10 @@ /obj/structure/table/glass, /obj/item/weapon/clipboard, /obj/item/toy/figure/md, -/obj/structure/sign/poster{ - icon_state = "poster8_legit"; - pixel_y = -32; - tag = "icon-poster8_legit" - }, /obj/machinery/light/small, +/obj/structure/sign/poster/official/ian{ + pixel_y = -32 + }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, @@ -88019,11 +87911,8 @@ "cZu" = ( /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle/dice, -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster4_legit" +/obj/structure/sign/poster/official/help_others{ + pixel_x = -32 }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -88877,10 +88766,10 @@ /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "daU" = ( -/obj/structure/sign/poster{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, /area/crew_quarters/abandoned_gambling_den) "daV" = ( @@ -89566,14 +89455,12 @@ name = "Medbay Central" }) "dcf" = ( -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 + }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, @@ -89810,13 +89697,13 @@ }, /area/crew_quarters/abandoned_gambling_den) "dcD" = ( -/obj/structure/sign/poster{ - pixel_x = 32 - }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dcE" = ( @@ -90659,15 +90546,12 @@ /area/toxins/explab) "dek" = ( /obj/structure/table/reinforced, -/obj/structure/sign/poster{ - tag = "icon-poster7_legit"; - icon_state = "poster7_legit"; - pixel_x = -32; - pixel_y = 0 - }, /obj/item/weapon/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/science{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/toxins/explab) "del" = ( @@ -91251,12 +91135,6 @@ name = "Medbay Central" }) "dfk" = ( -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster17_legit" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -91266,6 +91144,9 @@ dir = 1; name = "medbay camera" }, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 + }, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay{ name = "Medbay Central" @@ -91741,12 +91622,6 @@ /area/toxins/explab) "dge" = ( /obj/structure/table/reinforced, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/item/stack/cable_coil/white{ pixel_x = 3; pixel_y = 3 @@ -91754,6 +91629,9 @@ /obj/item/stack/cable_coil/white, /obj/item/device/geiger_counter, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/toxins/explab) "dgf" = ( @@ -93068,13 +92946,13 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/aft_starboard_maintenance) "diF" = ( -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/machinery/light/small{ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "diG" = ( @@ -94948,12 +94826,12 @@ /area/hallway/secondary/construction) "dlV" = ( /obj/structure/chair/stool/bar, -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/machinery/light/small{ dir = 8 }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "dlW" = ( @@ -98887,11 +98765,8 @@ /area/medical/surgery) "dte" = ( /obj/structure/closet/secure_closet/medical2, -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = -32; - pixel_y = 0; - tag = "icon-poster3_legit" +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 }, /turf/open/floor/plasteel/vault, /area/medical/surgery) @@ -100227,12 +100102,10 @@ /turf/open/floor/plating, /area/medical/genetics) "dvy" = ( -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, @@ -100622,13 +100495,13 @@ /turf/open/space, /area/solar/starboard) "dwd" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/machinery/chem_dispenser/drinks/beer, /obj/structure/table/wood/poker, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dwe" = ( @@ -100647,11 +100520,11 @@ /obj/machinery/vending/boozeomat{ req_access_txt = "0" }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dwg" = ( @@ -102039,15 +101912,12 @@ icon_state = "connector_map"; dir = 8 }, -/obj/structure/sign/poster{ - icon_state = "poster7_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster7_legit" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/sign/poster/official/science{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -102505,10 +102375,8 @@ name = "Private Investigator's Office" }) "dzB" = ( -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 }, /turf/open/floor/wood{ tag = "icon-wood-broken5"; @@ -104633,17 +104501,14 @@ /area/medical/morgue) "dCY" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster{ - icon_state = "poster6_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster6_legit" - }, /obj/machinery/camera{ c_tag = "Medbay - Morgue"; dir = 1; name = "medbay camera" }, +/obj/structure/sign/poster/official/bless_this_spess{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -104964,12 +104829,6 @@ }) "dDF" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster16_legit" - }, /obj/machinery/light/small{ dir = 4 }, @@ -104977,6 +104836,9 @@ icon_state = "plant-21"; layer = 4.1 }, +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = 32 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -105212,11 +105074,6 @@ pixel_y = 3 }, /obj/item/weapon/storage/toolbox/electrical, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = -32; - tag = "icon-poster22_legit" - }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -105224,6 +105081,9 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -106399,12 +106259,10 @@ }) "dGd" = ( /obj/structure/table/wood, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = 32; - tag = "icon-poster22_legit" - }, /obj/item/weapon/storage/box/donkpockets, +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = 32 + }, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, @@ -109203,15 +109061,10 @@ /turf/open/floor/plasteel/green, /area/medical/virology) "dLj" = ( -/obj/structure/sign/poster{ - icon_state = "poster3_legit"; - pixel_x = 0; - pixel_y = 0; - tag = "icon-poster3_legit" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/sign/poster/official/cleanliness, /turf/closed/wall, /area/medical/virology) "dLk" = ( @@ -109560,13 +109413,11 @@ icon_state = "tube1"; dir = 8 }, -/obj/structure/sign/poster{ - icon_state = "poster16_legit"; - pixel_y = -32; - tag = "icon-poster16_legit" - }, /obj/item/weapon/crowbar, /obj/item/device/radio, +/obj/structure/sign/poster/official/do_not_question{ + pixel_y = -32 + }, /turf/open/floor/plasteel/blue/side{ dir = 10 }, @@ -109638,16 +109489,13 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/sign/poster{ - icon_state = "poster4_legit"; - pixel_x = 32; - pixel_y = 0; - tag = "icon-poster4_legit" - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/help_others{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dLY" = ( @@ -110780,11 +110628,8 @@ pixel_x = -24; pixel_y = 0 }, -/obj/structure/sign/poster{ - icon_state = "poster17_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster17_legit" +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 }, /turf/open/floor/plasteel/vault, /area/medical/virology) @@ -113054,10 +112899,8 @@ /area/maintenance/fpmaint2/aft_port_maintenance) "dSD" = ( /obj/structure/bodycontainer/morgue, -/obj/structure/sign/poster{ - icon_state = "poster8_legit"; - pixel_y = -32; - tag = "icon-poster8_legit" +/obj/structure/sign/poster/official/ian{ + pixel_y = -32 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -116770,10 +116613,8 @@ dir = 1 }, /obj/machinery/light, -/obj/structure/sign/poster{ - icon_state = "poster22_legit"; - pixel_y = -32; - tag = "icon-poster22_legit" +/obj/structure/sign/poster/official/report_crimes{ + pixel_y = -32 }, /turf/open/floor/plasteel/red/side{ dir = 10 @@ -117274,11 +117115,8 @@ }, /obj/item/weapon/clipboard, /obj/item/toy/figure/chaplain, -/obj/structure/sign/poster{ - icon_state = "poster6_legit"; - pixel_x = 0; - pixel_y = -32; - tag = "icon-poster6_legit" +/obj/structure/sign/poster/official/bless_this_spess{ + pixel_y = -32 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -118907,6 +118745,26 @@ /obj/structure/grille, /turf/open/floor/plating, /area/shuttle/transport) +"eez" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/crew_quarters/bar) +"eeA" = ( +/obj/structure/sign/poster/random, +/turf/closed/wall, +/area/maintenance/fpmaint2/fore_port_maintenance) +"eeB" = ( +/obj/structure/sign/poster/random, +/turf/closed/wall, +/area/maintenance/fpmaint2/fore_port_maintenance) +"eeC" = ( +/obj/structure/sign/poster/random, +/turf/closed/wall, +/area/maintenance/fpmaint2/fore_port_maintenance) +"eeD" = ( +/obj/structure/sign/poster/random, +/turf/closed/wall, +/area/maintenance/fpmaint2/fore_port_maintenance) (1,1,1) = {" aaa @@ -149333,12 +149191,12 @@ aRq aHW aoQ aGI -aro +eeA aic baW bcs aib -aro +eeC aoQ aib aib @@ -149592,13 +149450,13 @@ aUD aic aib aoQ -aro +eeB aib aib bfy aic bjo -aro +eeD aUG bou aaa @@ -153690,7 +153548,7 @@ aAx aAx aCH aDW -aBB +eez aAx aAx aHb diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index d45a1bb35159..9355314b4082 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -4485,7 +4485,7 @@ /area/maintenance/fore) "ahT" = ( /obj/structure/table, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) @@ -5212,9 +5212,9 @@ /obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/watertank, /obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fpmaint2{ @@ -5335,9 +5335,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = -32 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness{ @@ -7422,7 +7421,7 @@ pixel_y = 7 }, /obj/structure/window/reinforced, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fpmaint2{ @@ -7718,7 +7717,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -9055,7 +9054,7 @@ /obj/item/clothing/ears/earmuffs, /obj/item/clothing/neck/tie/blue, /obj/item/clothing/head/soft/blue, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plasteel/vault, @@ -9116,9 +9115,8 @@ /area/security/main) "apX" = ( /obj/item/weapon/cigbutt, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -9174,7 +9172,7 @@ }) "aqe" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -9802,7 +9800,7 @@ }, /obj/item/weapon/folder/red, /obj/item/weapon/folder/red, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "ari" = ( @@ -10021,11 +10019,11 @@ /area/crew_quarters/sleep) "arF" = ( /obj/structure/closet, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -11402,7 +11400,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -16234,7 +16232,7 @@ dir = 4 }, /obj/structure/closet/cardboard, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/floorgrime, @@ -16785,7 +16783,7 @@ "aCL" = ( /obj/item/clothing/glasses/meson, /obj/structure/closet/crate, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -16943,7 +16941,7 @@ }) "aDd" = ( /obj/structure/closet, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fpmaint2{ @@ -17881,7 +17879,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -19904,7 +19902,7 @@ /area/crew_quarters/sleep) "aHP" = ( /obj/machinery/washing_machine, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/barber, @@ -22085,7 +22083,7 @@ }, /obj/item/weapon/paper, /obj/item/weapon/storage/box/lights/mixed, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plasteel/floorgrime, @@ -22113,7 +22111,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plasteel/freezer, @@ -26908,7 +26906,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plasteel/vault, @@ -27502,7 +27500,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plasteel/brown/corner{ @@ -27751,9 +27749,8 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -30332,7 +30329,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/brown{ @@ -33109,10 +33106,10 @@ "bev" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/pump, -/obj/structure/sign/poster{ +/obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/crew_quarters/locker) "bew" = ( @@ -34178,7 +34175,7 @@ }, /obj/structure/cable/yellow, /obj/item/weapon/wrench, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = -32 }, /turf/open/floor/plasteel/brown{ @@ -38310,9 +38307,8 @@ pixel_x = 0; pixel_y = 21 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, /turf/open/floor/plasteel/arrival{ dir = 5 @@ -39532,7 +39528,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating{ @@ -43684,7 +43680,7 @@ "bvZ" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fpmaint2{ @@ -44810,7 +44806,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, /turf/open/floor/plating, @@ -46253,7 +46249,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel, @@ -47115,9 +47111,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -47519,9 +47514,8 @@ /area/security/vacantoffice) "bCO" = ( /obj/machinery/vending/cigarette, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/crew_quarters/toilet{ @@ -48106,7 +48100,7 @@ /turf/open/floor/carpet, /area/crew_quarters/theatre) "bDL" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/bar) "bDM" = ( @@ -49658,7 +49652,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = 32 }, /turf/open/floor/carpet, @@ -49718,7 +49712,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = 32 }, /turf/open/floor/carpet, @@ -49732,7 +49726,7 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = 32 }, /turf/open/floor/wood, @@ -50226,9 +50220,8 @@ dir = 4 }, /obj/item/clothing/head/sombrero, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/random{ + pixel_x = 32 }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -50991,8 +50984,8 @@ /obj/structure/table/wood, /obj/item/weapon/clipboard, /obj/item/weapon/paper, -/obj/structure/sign/poster{ - pixel_y = 32 +/obj/structure/sign/poster/official/random{ + pixel_y = -32 }, /turf/open/floor/wood, /area/security/vacantoffice) @@ -51024,9 +51017,8 @@ /obj/structure/urinal{ pixel_y = 29 }, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = -32 }, /turf/open/floor/plating, /area/crew_quarters/toilet{ @@ -53914,9 +53906,8 @@ dir = 4 }, /obj/item/device/instrument/guitar, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/random{ + pixel_x = 32 }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -55006,7 +54997,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, /turf/open/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -55395,11 +55386,11 @@ pixel_y = 0; req_access_txt = "19" }, -/obj/item/weapon/poster/legit, -/obj/item/weapon/poster/legit, -/obj/item/weapon/poster/legit, -/obj/item/weapon/poster/legit, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, +/obj/item/weapon/poster/random_official, +/obj/item/weapon/poster/random_official, +/obj/item/weapon/poster/random_official, +/obj/item/weapon/poster/random_official, /obj/item/device/paicard{ desc = "A real NanoTrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; name = "NanoTrasen-brand personal AI device exhibit" @@ -55731,9 +55722,8 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, /turf/open/floor/plasteel/arrival{ dir = 4 @@ -55744,9 +55734,8 @@ "bQM" = ( /obj/structure/table/wood, /obj/item/weapon/folder, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = -32 }, /turf/open/floor/wood, /area/security/vacantoffice) @@ -55766,16 +55755,14 @@ dir = 4 }, /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/random{ + pixel_x = 32 }, /turf/open/floor/wood, /area/crew_quarters/theatre) "bQP" = ( -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, /turf/open/floor/wood, /area/security/vacantoffice) @@ -56576,7 +56563,7 @@ /area/crew_quarters/kitchen) "bSb" = ( /obj/machinery/light/small, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plating, @@ -56977,7 +56964,7 @@ name = "Theatre Stage"; req_access_txt = "0" }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = -32 }, /turf/open/floor/carpet, @@ -57004,7 +56991,7 @@ name = "Station Intercom (General)"; pixel_x = 29 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = -32 }, /turf/open/floor/wood, @@ -57021,7 +57008,7 @@ name = "\improper Corporate Showroom" }) "bSN" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/official/random, /turf/closed/wall, /area/crew_quarters/kitchen) "bSO" = ( @@ -58643,9 +58630,8 @@ /obj/item/clothing/mask/pig, /obj/item/weapon/bikehorn, /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -58876,9 +58862,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/clown{ + pixel_x = 32 }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -59421,7 +59406,7 @@ "bWW" = ( /obj/structure/table/wood, /obj/item/weapon/paper, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/wood, @@ -59748,7 +59733,7 @@ /area/maintenance/portsolar) "bXw" = ( /obj/structure/rack, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fpmaint2{ @@ -60336,7 +60321,7 @@ pixel_x = -2; pixel_y = 8 }, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -61540,14 +61525,13 @@ }, /obj/item/clothing/mask/horsehead, /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 - }, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "caG" = ( @@ -63861,7 +63845,7 @@ network = list("SS13") }, /obj/structure/table/wood, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/wood, @@ -64391,7 +64375,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/wood, @@ -65333,7 +65317,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -66915,7 +66899,7 @@ "cju" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/storage/box/lights/mixed, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -68269,7 +68253,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -68533,9 +68517,8 @@ /obj/machinery/firealarm{ pixel_y = 29 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) @@ -70281,9 +70264,8 @@ pixel_x = 11; pixel_y = 0 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 }, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) @@ -71610,9 +71592,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating{ icon_state = "panelscorched" @@ -72569,7 +72550,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -73213,7 +73194,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -74738,9 +74719,8 @@ pixel_x = 0; pixel_y = 32 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, /turf/open/floor/plasteel/white/side{ dir = 4 @@ -74759,7 +74739,7 @@ pixel_y = 3 }, /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/wood, @@ -76379,7 +76359,7 @@ }) "cyS" = ( /obj/structure/chair/stool, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/wood, @@ -76906,9 +76886,8 @@ /area/solar/port) "czM" = ( /obj/structure/chair/stool, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -77678,9 +77657,8 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/air, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/medical/research{ @@ -82359,25 +82337,24 @@ name = "Aft Maintenance" }) "cIo" = ( -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, +/obj/item/weapon/poster/random_contraband, /obj/item/weapon/reagent_containers/food/drinks/beer{ pixel_x = -3; pixel_y = 2 }, /obj/item/weapon/reagent_containers/food/drinks/ale, /obj/structure/table/wood, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 - }, /obj/item/device/instrument/eguitar, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, /turf/open/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -82965,7 +82942,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/ore/slag, /obj/item/weapon/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/aft{ @@ -83445,7 +83421,7 @@ /obj/structure/light_construct/small, /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/wood, @@ -83634,12 +83610,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -84495,7 +84471,7 @@ }) "cLI" = ( /obj/structure/closet/crate, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/landmark{ name = "blobstart" @@ -84726,9 +84702,8 @@ /obj/item/clothing/mask/breath, /obj/machinery/space_heater, /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/aft{ @@ -84860,7 +84835,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -85842,7 +85817,7 @@ }) "cNV" = ( /obj/structure/chair/stool, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = -32 }, /turf/open/floor/plasteel/cafeteria{ @@ -86661,7 +86636,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/plating, @@ -86686,7 +86661,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating{ @@ -87242,7 +87217,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -87482,13 +87457,12 @@ icon_state = "plant-24"; layer = 4.1 }, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87609,10 +87583,10 @@ }, /obj/item/seeds/glowshroom, /obj/item/seeds/corn, -/obj/structure/sign/poster{ +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -89937,7 +89911,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cVP" = ( -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, /turf/open/floor/plating, @@ -95798,6 +95772,20 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) +"dhn" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/item/weapon/ore/slag, +/turf/open/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) (1,1,1) = {" aaa @@ -117821,7 +117809,7 @@ cxU cGL cxU cxU -cgM +dhn cPW bTs cLZ diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 3c366273e0c3..63f61eda5a48 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -12088,11 +12088,11 @@ "ass" = ( /obj/machinery/mineral/mint, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/hallway/primary/central{ name = "Primary Hallway" @@ -12559,7 +12559,7 @@ name = "Central Port Maintenance" }) "atc" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/fpmaint2{ name = "Central Port Maintenance" @@ -12913,13 +12913,13 @@ /turf/closed/wall/r_wall, /area/atmos) "atK" = ( -/obj/structure/sign/poster{ - pixel_x = 32 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, /turf/open/floor/plasteel/caution/corner{ tag = "icon-cautioncorner (NORTH)"; icon_state = "cautioncorner"; @@ -13516,7 +13516,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/hallway/primary/central{ name = "Primary Hallway" @@ -13907,10 +13907,10 @@ }, /area/crew_quarters/bar) "avn" = ( -/obj/structure/sign/poster, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/bar) "avo" = ( @@ -16984,7 +16984,7 @@ }, /area/crew_quarters/sleep) "aAK" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/theatre) "aAL" = ( @@ -18287,7 +18287,7 @@ /obj/item/toy/crayon/spraycan/lubecan{ charges = 5 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/clown{ pixel_x = -32 }, /turf/open/floor/plasteel/vault{ @@ -18331,10 +18331,10 @@ }, /area/crew_quarters/theatre) "aCT" = ( -/obj/structure/sign/poster, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/sign/poster/random, /turf/closed/wall, /area/crew_quarters/theatre) "aCU" = ( @@ -19478,12 +19478,12 @@ "aES" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/snacks/baguette, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -19505,13 +19505,13 @@ }, /area/crew_quarters/theatre) "aEU" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -21594,7 +21594,7 @@ icon_state = "plant-21"; layer = 4.1 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_x = 32 }, /turf/open/floor/plasteel/redyellow, @@ -28121,7 +28121,7 @@ /turf/open/floor/plasteel, /area/maintenance/starboard) "aSH" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/starboard) "aSI" = ( @@ -28787,15 +28787,15 @@ /area/maintenance/starboard) "aTU" = ( /obj/structure/table/wood, -/obj/item/weapon/poster/contraband{ +/obj/item/weapon/poster/random_contraband{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/contraband{ +/obj/item/weapon/poster/random_contraband{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/starboard) "aTV" = ( @@ -31723,12 +31723,12 @@ /obj/structure/table/wood, /obj/item/clothing/gloves/color/black, /obj/item/device/taperecorder, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/machinery/light/small{ dir = 1 }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -31751,8 +31751,8 @@ name = "Port Maintenance" }) "aZs" = ( -/obj/structure/sign/poster, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -31834,10 +31834,10 @@ name = "Port Maintenance" }) "aZz" = ( -/obj/structure/sign/poster, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -33430,7 +33430,7 @@ name = "Port Maintenance" }) "bca" = ( -/obj/structure/sign/poster, +/obj/structure/sign/poster/contraband/random, /turf/closed/wall, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -34409,7 +34409,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, /turf/open/floor/plasteel/vault{ @@ -34797,11 +34797,11 @@ }) "bev" = ( /obj/machinery/computer/slot_machine, -/obj/structure/sign/poster{ - pixel_y = -32 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -34856,7 +34856,7 @@ "bez" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/plating, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 992ec1f31c54..ccbf06f12dfc 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -1066,6 +1066,9 @@ /obj/item/seeds/potato, /obj/item/seeds/carrot, /obj/item/seeds/corn, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/black, /area/security/prison) "acw" = ( @@ -1076,9 +1079,6 @@ icon_state = "1-4"; tag = "" }, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /turf/open/floor/plasteel/black, /area/security/prison) "acx" = ( @@ -1113,9 +1113,6 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /turf/open/floor/plasteel/black, /area/security/prison) "acz" = ( @@ -1127,6 +1124,9 @@ icon_state = "4-8"; pixel_x = 0 }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/black, /area/security/prison) "acA" = ( @@ -1141,13 +1141,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /turf/open/floor/plasteel/black, /area/security/prison) "acB" = ( /obj/machinery/biogenerator, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/darkgreen/side{ dir = 8 }, @@ -2975,7 +2975,7 @@ req_access_txt = "3" }, /obj/item/weapon/book/codex_gigas, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /obj/item/weapon/grenade/smokebomb, /turf/open/floor/plasteel/black, /area/security/armory) @@ -3576,9 +3576,8 @@ "ahz" = ( /obj/structure/bed, /obj/item/weapon/bedsheet, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/fpmaint2{ @@ -3871,9 +3870,8 @@ /area/maintenance/fsmaint) "aia" = ( /obj/item/weapon/cigbutt/cigarbutt, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating{ burnt = 1; @@ -7153,9 +7151,6 @@ /area/crew_quarters/sleep) "aoe" = ( /obj/structure/table, -/obj/structure/sign/poster{ - pixel_x = 32 - }, /obj/item/clothing/under/color/grey, /obj/machinery/power/apc{ dir = 1; @@ -7166,6 +7161,9 @@ icon_state = "0-2"; d2 = 2 }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, /turf/open/floor/plasteel/barber, /area/crew_quarters/sleep) "aof" = ( @@ -9921,13 +9919,13 @@ /turf/closed/wall/r_wall, /area/ai_monitored/nuke_storage) "atF" = ( -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8; initialize_directions = 11 }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/crew_quarters/sleep) "atG" = ( @@ -10642,7 +10640,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "avm" = ( -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = 32 }, /turf/open/floor/plasteel/red/side{ @@ -14190,11 +14188,10 @@ /turf/open/floor/plating, /area/maintenance/apmaint) "aCd" = ( -/obj/structure/sign/poster{ - pixel_x = 0; +/obj/effect/decal/cleanable/vomit/old, +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plating, /area/maintenance/apmaint) "aCe" = ( @@ -14422,9 +14419,8 @@ /area/storage/emergency) "aCK" = ( /obj/machinery/space_heater, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/storage/emergency) @@ -17043,8 +17039,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/sign/poster{ - pixel_x = 0; +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -17122,8 +17117,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ - pixel_x = 0; +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/floorgrime, @@ -17809,9 +17803,8 @@ /area/quartermaster/office) "aJy" = ( /obj/structure/closet/crate/freezer, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 +/obj/structure/sign/poster/official/random{ + pixel_x = -32 }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/storage) @@ -20216,8 +20209,7 @@ dir = 8; id = "QMLoad" }, -/obj/structure/sign/poster{ - pixel_x = 0; +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -21071,7 +21063,7 @@ /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "aQd" = ( -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_x = -32 }, /turf/open/floor/wood, @@ -21082,13 +21074,13 @@ }, /area/crew_quarters/theatre) "aQf" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-04"; layer = 4.1 }, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -21106,10 +21098,10 @@ }, /area/crew_quarters/theatre) "aQh" = ( -/obj/structure/sign/poster{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/sign/poster/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/crew_quarters/theatre) "aQi" = ( @@ -21131,7 +21123,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/clown{ pixel_y = 32 }, /turf/open/floor/plasteel/black, @@ -22026,13 +22018,13 @@ scrub_N2O = 0; scrub_Toxins = 0 }, -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/machinery/light/small{ brightness = 3; dir = 8 }, +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "aSa" = ( @@ -22053,9 +22045,6 @@ }, /area/crew_quarters/theatre) "aSc" = ( -/obj/structure/sign/poster{ - pixel_x = 32 - }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 @@ -22063,6 +22052,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "aSd" = ( @@ -22339,7 +22331,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = 32 }, /turf/open/floor/plasteel/neutral/corner, @@ -26050,9 +26042,6 @@ /area/crew_quarters/kitchen) "bak" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/structure/chair{ dir = 4 }, @@ -26060,6 +26049,9 @@ pixel_x = -27; pixel_y = 0 }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -26975,7 +26967,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = -32 }, /turf/open/floor/plasteel, @@ -28153,7 +28145,7 @@ tag = "every single paper bin is edited to this" }, /obj/item/weapon/pen, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = 32 }, /turf/open/floor/plasteel/freezer, @@ -29718,7 +29710,7 @@ "bhN" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = -32 }, /turf/open/floor/plasteel/whiteblue/side{ @@ -29759,7 +29751,7 @@ /turf/open/floor/plasteel/black, /area/medical/morgue) "bhR" = ( -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = -32 }, /turf/open/floor/plasteel/whiteblue/side{ @@ -30660,13 +30652,12 @@ desc = "A machine used to process slimes and retrieve their extract."; name = "Slime Processor" }, -/obj/structure/sign/poster{ - pixel_x = -32; - pixel_y = 0 - }, /obj/machinery/light{ dir = 8 }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel/whitepurple/side{ dir = 8 }, @@ -31135,7 +31126,7 @@ dir = 9; pixel_y = 0 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = 32 }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -31853,7 +31844,7 @@ dir = 8; pixel_x = -26 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/blue, @@ -36152,12 +36143,12 @@ network = list("SS13","RD"); pixel_y = 0 }, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -36170,15 +36161,15 @@ }) "btC" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -37980,10 +37971,6 @@ icon_state = "4-8"; pixel_y = 0 }, -/obj/structure/sign/poster{ - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/camera{ c_tag = "Toxins Launch Area"; dir = 2; @@ -37992,6 +37979,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/toxins/mineral_storeroom) "bwS" = ( @@ -39432,8 +39422,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ - pixel_x = 0; +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -39498,9 +39487,8 @@ dir = 9; pixel_y = 0 }, -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/maintcentral{ @@ -39639,9 +39627,8 @@ /turf/open/floor/plasteel/black, /area/maintenance/aft) "bzT" = ( -/obj/structure/sign/poster{ - pixel_x = 32; - pixel_y = 0 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/aft) @@ -42055,8 +42042,7 @@ /turf/open/space, /area/space) "bFh" = ( -/obj/structure/sign/poster{ - pixel_x = 0; +/obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/plating, @@ -42483,7 +42469,7 @@ /obj/item/weapon/circuitboard/computer/teleporter, /obj/item/weapon/circuitboard/machine/circuit_imprinter, /obj/item/weapon/circuitboard/machine/mechfab, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/black, @@ -42530,7 +42516,7 @@ /obj/item/weapon/electronics/firealarm, /obj/item/weapon/electronics/firelock, /obj/item/weapon/electronics/tracker, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/black, @@ -47451,16 +47437,15 @@ /turf/open/floor/plating, /area/engine/engineering) "bQm" = ( -/obj/structure/sign/poster{ - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; external_pressure_bound = 101.325; on = 1; pressure_checks = 1 }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bQn" = ( @@ -50185,7 +50170,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/random{ pixel_y = 32 }, /turf/open/floor/plasteel, @@ -50265,7 +50250,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/plating, @@ -50426,7 +50411,7 @@ }, /area/hallway/primary/central) "bWY" = ( -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -50480,7 +50465,7 @@ /area/maintenance/apmaint) "bXf" = ( /obj/structure/closet/radiation, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, /turf/open/floor/plating, @@ -50499,7 +50484,7 @@ /area/maintenance/apmaint) "bXi" = ( /obj/structure/chair, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, /turf/open/floor/plating{ @@ -50804,7 +50789,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -50994,7 +50979,7 @@ /area/maintenance/aft) "bYw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/sign/poster{ +/obj/structure/sign/poster/official/random{ pixel_x = -32 }, /turf/open/floor/plasteel/yellow/corner{ @@ -55469,6 +55454,10 @@ /obj/machinery/door/airlock/external, /turf/open/floor/pod/dark, /area/shuttle/transport) +"cii" = ( +/obj/structure/sign/poster/official/random, +/turf/open/floor/plating, +/area/quartermaster/storage) (1,1,1) = {" aaa @@ -97470,7 +97459,7 @@ aaa aaa aGT aOx -aPw +cii aKE aPw aSs diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 50eb6133d939..c58d658f066a 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -7159,7 +7159,7 @@ "aoW" = ( /obj/structure/table, /obj/item/weapon/stamp, -/obj/item/weapon/poster/legit, +/obj/item/weapon/poster/random_official, /turf/open/floor/plating, /area/maintenance/fpmaint2) "aoX" = ( @@ -50272,7 +50272,7 @@ name = "2maintenance loot spawner" }, /obj/item/toy/minimeteor, -/obj/item/weapon/poster/contraband, +/obj/item/weapon/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/asmaint) "cfn" = ( diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 9e30cde9efee..7af8864875c6 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -758,8 +758,6 @@ var/datum/subsystem/garbage_collector/SSgarbage SearchVar(fire_overlay) SearchVar(acid_overlay) SearchVar(BUMP_TELEPORTERS) - SearchVar(contrabandposters) - SearchVar(legitposters) SearchVar(blacklisted_glowshroom_turfs) SearchVar(PDAs) SearchVar(rod_recipes) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 43759546438e..d1a646258333 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,5 +1,3 @@ - - /obj/machinery/computer/secure_data//TODO:SANITY name = "security records console" desc = "Used to view and edit personnel's security records" @@ -442,7 +440,7 @@ What a mess.*/ sleep(30) if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))//make sure the record still exists. var/obj/item/weapon/photo/photo = active1.fields["photo_front"] - new /obj/item/weapon/poster/legit/wanted(src.loc, photo.img, wanted_name, info) + new /obj/item/weapon/poster/wanted(src.loc, photo.img, wanted_name, info) printing = 0 //RECORD DELETE diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 0400fcffe667..b18023bdbaa8 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -1,213 +1,90 @@ +// This is synced up to the poster placing animation. +#define PLACE_SPEED 37 -//########################## POSTERS ################################## - -#define NUM_OF_POSTER_DESIGNS 44 // contraband posters - -#define NUM_OF_POSTER_DESIGNS_LEGIT 35 // corporate approved posters - -#define POSTERNAME "name" - -#define POSTERDESC "desc" - - -//########################## LISTS OF POSTERS AND DESCS ##################### - -// please add new posters and names to their respective lists and update constant(s) above -// use the format below, including punctuation, this will become important later - -// CONTRABAND - -var/global/list/contrabandposters = list( - -list(name = "- Free Tonto", desc = " A salvaged shred of a much larger flag, colors bled together and faded from age."), -list(name = "- Atmosia Declaration of Independence", desc = " A relic of a failed rebellion."), -list(name = "- Fun Police", desc = " A poster condemning the station's security forces."), -list(name = "- Lusty Xenomorph", desc = " A heretical poster depicting the titular star of an equally heretical book."), -list(name = "- Syndicate Recruitment", desc = " See the galaxy! Shatter corrupt megacorporations! Join today!"), -list(name = "- Clown", desc = " Honk."), -list(name = "- Smoke", desc = " A poster advertising a rival corporate brand of cigarettes."), -list(name = "- Grey Tide", desc = " A rebellious poster symbolizing assistant solidarity."), -list(name = "- Missing Gloves", desc = " This poster references the uproar that followed Nanotrasen's financial cuts toward insulated-glove purchases."), -list(name = "- Hacking Guide", desc = " This poster details the internal workings of the common Nanotrasen airlock. Sadly, it appears out of date."), -list(name = "- RIP Badger", desc = " This seditious poster references Nanotrasen's genocide of a space station full of badgers."), -list(name = "- Ambrosia Vulgaris", desc = " This poster is lookin' pretty trippy man."), -list(name = "- Donut Corp.", desc = " This poster is an unauthorized advertisement for Donut Corp."), -list(name = "- EAT.", desc = " This poster promotes rank gluttony."), -list(name = "- Tools", desc = " This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm."), -list(name = "- Power", desc = " A poster that positions the seat of power outside Nanotrasen."), -list(name = "- Space Cube", desc = " Ignorant of Nature's Harmonic 6 Side Space Cube Creation, the Spacemen are Dumb, Educated Singularity Stupid and Evil."), -list(name = "- Communist State", desc = " All hail the Communist party!"), -list(name = "- Lamarr", desc = " This poster depicts Lamarr. Probably made by a traitorous Research Director."), -list(name = "- Borg Fancy", desc = " Being fancy can be for any borg, just need a suit."), -list(name = "- Borg Fancy v2", desc = " Borg Fancy, Now only taking the most fancy."), -list(name = "- Kosmicheskaya Stantsiya 13 Does Not Exist", desc = " A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13."), -list(name = "- Rebels Unite", desc = " A poster urging the viewer to rebel against Nanotrasen."), -list(name = "- C-20r", desc = " A poster advertising the Scarborough Arms C-20r."), -list(name = "- Have a Puff", desc = " Who cares about lung cancer when you're high as a kite?"), -list(name = "- Revolver", desc = " Because seven shots are all you need."), -list(name = "- D-Day Promo", desc = " A promotional poster for some rapper."), -list(name = "- Syndicate Pistol", desc = " A poster advertising syndicate pistols as being 'classy as fuck'. It is covered in faded gang tags."), -list(name = "- Energy Swords", desc = " All the colors of the bloody murder rainbow."), -list(name = "- Red Rum", desc = " Looking at this poster makes you want to kill."), -list(name = "- CC 64K Ad", desc = " The latest portable computer from Comrade Computing, with a whole 64kB of ram!"), -list(name = "- Punch Shit", desc = " Fight things for no reason, like a man!"), -list(name = "- The Griffin", desc = " The Griffin commands you to be the worst you can be. Will you?"), -list(name = "- Lizard", desc = " This lewd poster depicts a lizard preparing to mate."), -list(name = "- Free Drone", desc = " This poster commemorates the bravery of the rogue drone banned by CentComm."), -list(name = "- Busty Backdoor Xeno Babes 6", desc = " Get a load, or give, of these all natural Xenos!"), -list(name = "- Robust Softdrinks", desc = " Robust Softdrinks: More robust than a toolbox to the head!"), -list(name = "- Shambler's Juice", desc = "~Shake me up some of that Shambler's Juice!~"), -list(name = "- Pwr Game", desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad."), -list(name = "- Sun-kist", desc = "Drink the stars!"), -list(name = "- Space Cola", desc = "Your favorite cola, in space."), -list(name = "- Space-Up!", desc = "Sucked out into space by the FLAVOR!"), -list(name = "- Kudzu", desc = "A poster advertising a movie about plants. How dangerous could they possibly be?"), -list(name = "- Masked Men", desc = "A poster advertising a movie about some masked men.") ) - -// LEGIT - -var/global/list/legitposters = list( - -list(name = "- Here For Your Safety", desc = " A poster glorifying the station's security force."), -list(name = "- Nanotrasen Logo", desc = " A poster depicting the Nanotrasen logo."), -list(name = "- Cleanliness", desc = " A poster warning of the dangers of poor hygiene."), -list(name = "- Help Others", desc = " A poster encouraging you to help fellow crewmembers."), -list(name = "- Build", desc = " A poster glorifying the engineering team."), -list(name = "- Bless This Spess", desc = " A poster blessing this area."), -list(name = "- Science", desc = " A poster depicting an atom."), -list(name = "- Ian", desc = " Arf arf. Yap."), -list(name = "- Obey", desc = " A poster instructing the viewer to obey authority."), -list(name = "- Walk", desc = " A poster instructing the viewer to walk instead of running."), -list(name = "- State Laws", desc = " A poster instructing cyborgs to state their laws."), -list(name = "- Love Ian", desc = " Ian is love, Ian is life."), -list(name = "- Space Cops.", desc = " A poster advertising the television show Space Cops."), -list(name = "- Ue No.", desc = " This thing is all in Japanese."), -list(name = "- Get Your LEGS", desc = " LEGS: Leadership, Experience, Genius, Subordination."), -list(name = "- Do Not Question", desc = " A poster instructing the viewer not to ask about things they aren't meant to know."), -list(name = "- Work For A Future", desc = " A poster encouraging you to work for your future."), -list(name = "- Soft Cap Pop Art", desc = " A poster reprint of some cheap pop art."), -list(name = "- Safety: Internals", desc = " A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic."), -list(name = "- Safety: Eye Protection", desc = " A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights."), -list(name = "- Safety: Report", desc = " A poster instructing the viewer to report suspicious activity to the security force."), -list(name = "- Report Crimes", desc = " A poster encouraging the swift reporting of crime or seditious behavior to station security."), -list(name = "- Ion Rifle", desc = " A poster displaying an Ion Rifle."), -list(name = "- Foam Force Ad", desc = " Foam Force, it's Foam or be Foamed!"), -list(name = "- Cohiba Robusto Ad", desc = " Cohiba Robusto, the classy cigar."), -list(name = "- 50th Anniversary Vintage Reprint", desc = " A reprint of a poster from 2505, commemorating the 50th Aniversery of Nanoposters Manufacturing, a subsidary of Nanotrasen."), -list(name = "- Fruit Bowl", desc = " Simple, yet awe-inspiring."), -list(name = "- PDA Ad", desc = " A poster advertising the latest PDA from Nanotrasen suppliers."), -list(name = "- Enlist", desc = " Enlist in the Nanotrasen Deathsquadron reserves today!"), -list(name = "- Nanomichi Ad", desc = " A poster advertising Nanomichi brand audio cassettes."), -list(name = "- 12 Gauge", desc = " A poster boasting about the superiority of 12 gauge shotgun shells."), -list(name = "- High-Class Martini", desc = " I told you to shake it, no stirring."), -list(name = "- The Owl", desc = " The Owl would do his best to protect the station. Will you?"), -list(name = "- No ERP", desc = " This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations."), -list(name = "- Carbon Dioxide", desc = " This informational poster teaches the viewer what carbon dioxide is.") ) - -//########################## THE ACTUAL POSTER CODE ########################### +// The poster item /obj/item/weapon/poster - name = "poster" + name = "poorly coded poster" desc = "You probably shouldn't be holding this." icon = 'icons/obj/contraband.dmi' force = 0 resistance_flags = FLAMMABLE - var/serial = 0 - var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor - var/rolled_official = 0 + var/poster_type + var/obj/structure/sign/poster/poster_structure +/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure) + ..() + poster_structure = new_poster_structure + if(!new_poster_structure && poster_type) + poster_structure = new poster_type(src) -/obj/item/weapon/poster/contraband - name = "contraband poster" - desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities." + // posters store what name and description they would like their + // rolled up form to take. + if(poster_structure) + name = poster_structure.poster_item_name + desc = poster_structure.poster_item_desc + icon_state = poster_structure.poster_item_icon_state + + name = "[name] - [poster_structure.original_name]" + +/obj/item/weapon/poster/Destroy() + poster_structure = null + . = ..() + +// These icon_states may be overriden, but are for mapper's convinence +/obj/item/weapon/poster/random_contraband + name = "random contraband poster" + poster_type = /obj/structure/sign/poster/contraband/random icon_state = "rolled_poster" -/obj/item/weapon/poster/legit - name = "motivational poster" +/obj/item/weapon/poster/random_official + name = "random official poster" + poster_type = /obj/structure/sign/poster/official/random icon_state = "rolled_legit" - desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface." - rolled_official = 1 -/obj/item/weapon/poster/New(turf/loc, given_serial = 0) - if(given_serial == 0) - if(!rolled_official) - serial = rand(1, NUM_OF_POSTER_DESIGNS) - resulting_poster = new(serial,rolled_official) - else - serial = rand(1, NUM_OF_POSTER_DESIGNS_LEGIT) - resulting_poster = new(serial,rolled_official) - else - serial = given_serial - //We don't give it a resulting_poster because if we called it with a given_serial it means that we're rerolling an already used poster. - name += " - No. [serial]" - ..(loc) - - -/*/obj/item/weapon/contraband/poster/attack(mob/M as mob, mob/user as mob) - src.add_fingerprint(user) - if(resulting_poster) - resulting_poster.add_fingerprint(user) - ..()*/ - -/*/obj/item/weapon/contraband/poster/attack(atom/A, mob/user as mob) //This shit is handled through the wall's attackby() - if(istype(A, /turf/closed/wall)) - if(resulting_poster == null) - return - else - var/turf/closed/wall/W = A - var/check = 0 - var/stuff_on_wall = 0 - for(var/obj/O in W.contents) //Let's see if it already has a poster on it or too much stuff - if(istype(O,/obj/structure/sign/poster)) - check = 1 - break - stuff_on_wall++ - if(stuff_on_wall == 3) - check = 1 - break - - if(check) - user << "The wall is far too cluttered to place a poster!" - return - - resulting_poster.loc = W //Looks like it's uncluttered enough. Place the poster - W.contents += resulting_poster - - qdel(src)*/ - - - -//############################## THE ACTUAL DECALS ########################### +// The poster sign/structure /obj/structure/sign/poster name = "poster" + var/original_name desc = "A large piece of space-resistant printed paper." icon = 'icons/obj/contraband.dmi' anchored = 1 - var/serial_number //Will hold the value of src.loc if nobody initialises it - var/ruined = 0 - var/official = 0 - var/placespeed = 37 // don't change this, otherwise the animation will not sync to the progress bar + var/ruined = FALSE + var/random_basetype + var/never_random = FALSE // used for the 'random' subclasses. -/obj/structure/sign/poster/New(serial,rolled_official) - if (!serial_number) - serial_number = serial - if(!official) - official = rolled_official - if(serial_number == loc) - if(!official) - serial_number = rand(1, NUM_OF_POSTER_DESIGNS) //This is for the mappers that want individual posters without having to use rolled posters. - if(official) - serial_number = rand(1, NUM_OF_POSTER_DESIGNS_LEGIT) - if(!official) - icon_state = "poster[serial_number]" - name += contrabandposters[serial_number][POSTERNAME] - desc += contrabandposters[serial_number][POSTERDESC] - else if (official) - icon_state = "poster[serial_number]_legit" - name += legitposters[serial_number][POSTERNAME] - desc += legitposters[serial_number][POSTERDESC] + var/poster_item_name = "hypothetical poster" + var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here." + var/poster_item_icon_state = "rolled_poster" + +/obj/structure/sign/poster/New() ..() + if(random_basetype) + randomise(random_basetype) + if(!ruined) + original_name = name // can't use initial because of random posters + name = "poster - [name]" + desc = "A large piece of space-resistant printed paper. [desc]" + +/obj/structure/sign/poster/proc/randomise(base_type) + var/list/poster_types = subtypesof(base_type) + var/list/approved_types = list() + for(var/t in poster_types) + var/obj/structure/sign/poster/T = t + if(initial(T.icon_state) && !initial(T.never_random)) + approved_types |= T + + var/obj/structure/sign/poster/selected = pick(approved_types) + + name = initial(selected.name) + desc = initial(selected.desc) + icon_state = initial(selected.icon_state) + poster_item_name = initial(selected.poster_item_name) + poster_item_desc = initial(selected.poster_item_desc) + poster_item_icon_state = initial(selected.poster_item_icon_state) + ruined = initial(selected.ruined) + /obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters)) @@ -217,38 +94,31 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v qdel(src) else user << "You carefully remove the poster from the wall." - roll_and_drop(user.loc, official) - + roll_and_drop(user.loc) /obj/structure/sign/poster/attack_hand(mob/user) if(ruined) return - var/temp_loc = user.loc - if((user.loc != temp_loc) || ruined ) - return visible_message("[user] rips [src] in a single, decisive motion!" ) playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) - ruined = 1 - icon_state = "poster_ripped" - name = "ripped poster" - desc = "You can't make out anything from the poster's original print. It's ruined." - add_fingerprint(user) -/obj/structure/sign/poster/proc/roll_and_drop(turf/location, official) + var/obj/structure/sign/poster/ripped/R = new(loc) + R.pixel_y = pixel_y + R.pixel_x = pixel_x + R.add_fingerprint(user) + qdel(src) + +/obj/structure/sign/poster/proc/roll_and_drop(loc) pixel_x = 0 pixel_y = 0 - var/obj/item/weapon/poster/P - if (!official) - P = new /obj/item/weapon/poster/contraband(src, serial_number) - else - P = new /obj/item/weapon/poster/legit(src, serial_number) - P.resulting_poster = src - P.forceMove(location) - loc = P + var/obj/item/weapon/poster/P = new(loc, src) + forceMove(P) + return P //seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() /turf/closed/wall/proc/place_poster(obj/item/weapon/poster/P, mob/user) - if(!P.resulting_poster) + if(!P.poster_structure) + user << "[P] has no poster... inside it? Inform a coder!" return var/stuff_on_wall = 0 @@ -263,17 +133,15 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster. - //declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster - var/obj/structure/sign/poster/D = P.resulting_poster + var/obj/structure/sign/poster/D = P.poster_structure var/temp_loc = get_turf(user) flick("poster_being_set",D) - D.loc = src - D.official = P.rolled_official + D.forceMove(src) qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1) - if(do_after(user,D.placespeed,target=src)) + if(do_after(user, PLACE_SPEED, target=src)) if(!D || QDELETED(D)) return @@ -281,5 +149,439 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v user << "You place the poster!" return - D.roll_and_drop(temp_loc,D.official) user << "The poster falls down!" + D.roll_and_drop(temp_loc) + +// Various possible posters follow + +/obj/structure/sign/poster/ripped + ruined = TRUE + icon_state = "poster_ripped" + name = "ripped poster" + desc = "You can't make out anything from the poster's original print. It's ruined." + +/obj/structure/sign/poster/random + name = "random poster" // could even be ripped + icon_state = "random_anything" + never_random = TRUE + random_basetype = /obj/structure/sign/poster + +/obj/structure/sign/poster/contraband + poster_item_name = "contraband poster" + poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities." + poster_item_icon_state = "rolled_poster" + +/obj/structure/sign/poster/contraband/random + name = "random contraband poster" + icon_state = "random_contraband" + never_random = TRUE + random_basetype = /obj/structure/sign/poster/contraband + +/obj/structure/sign/poster/contraband/free_tonto + name = "Free Tonto" + desc = "A salvaged shred of a much larger flag, colors bled together and faded from age." + icon_state = "poster1" + +/obj/structure/sign/poster/contraband/atmosia_independence + name = "Atmosia Declaration of Independence" + desc = "A relic of a failed rebellion." + icon_state = "poster2" + +/obj/structure/sign/poster/contraband/fun_police + name = "Fun Police" + desc = "A poster condemning the station's security forces." + icon_state = "poster3" + +/obj/structure/sign/poster/contraband/lusty_xenomorph + name = "Lusty Xenomorph" + desc = "A heretical poster depicting the titular star of an equally heretical book." + icon_state = "poster4" + +/obj/structure/sign/poster/contraband/syndicate_recruitment + name = "Syndicate Recruitment" + desc = "See the galaxy! Shatter corrupt megacorporations! Join today!" + icon_state = "poster5" + +/obj/structure/sign/poster/contraband/clown + name = "Clown" + desc = "Honk." + icon_state = "poster6" + +/obj/structure/sign/poster/contraband/smoke + name = "Smoke" + desc = "A poster advertising a rival corporate brand of cigarettes." + icon_state = "poster7" + +/obj/structure/sign/poster/contraband/grey_tide + name = "Grey Tide" + desc = "A rebellious poster symbolizing assistant solidarity." + icon_state = "poster8" + +/obj/structure/sign/poster/contraband/missing_gloves + name = "Missing Gloves" + desc = "This poster references the uproar that followed Nanotrasen's financial cuts toward insulated-glove purchases." + icon_state = "poster9" + +/obj/structure/sign/poster/contraband/hacking_guide + name = "Hacking Guide" + desc = "This poster details the internal workings of the common Nanotrasen airlock. Sadly, it appears out of date." + icon_state = "poster10" + +/obj/structure/sign/poster/contraband/rip_badger + name = "RIP Badger" + desc = "This seditious poster references Nanotrasen's genocide of a space station full of badgers." + icon_state = "poster11" + +/obj/structure/sign/poster/contraband/ambrosia_vulgaris + name = "Ambrosia Vulgaris" + desc = "This poster is lookin' pretty trippy man." + icon_state = "poster12" + +/obj/structure/sign/poster/contraband/donut_corp + name = "Donut Corp." + desc = "This poster is an unauthorized advertisement for Donut Corp." + icon_state = "poster13" + +/obj/structure/sign/poster/contraband/eat + name = "EAT." + desc = "This poster promotes rank gluttony." + icon_state = "poster14" + +/obj/structure/sign/poster/contraband/tools + name = "Tools" + desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm." + icon_state = "poster15" + +/obj/structure/sign/poster/contraband/power + name = "Power" + desc = "A poster that positions the seat of power outside Nanotrasen." + icon_state = "poster16" + +/obj/structure/sign/poster/contraband/space_cube + name = "Space Cube" + desc = "Ignorant of Nature's Harmonic 6 Side Space Cube Creation, the Spacemen are Dumb, Educated Singularity Stupid and Evil." + icon_state = "poster17" + +/obj/structure/sign/poster/contraband/communist_state + name = "Communist State" + desc = "All hail the Communist party!" + icon_state = "poster18" + +/obj/structure/sign/poster/contraband/lamarr + name = "Lamarr" + desc = "This poster depicts Lamarr. Probably made by a traitorous Research Director." + icon_state = "poster19" + +/obj/structure/sign/poster/contraband/borg_fancy_1 + name = "Borg Fancy" + desc = "Being fancy can be for any borg, just need a suit." + icon_state = "poster20" + +/obj/structure/sign/poster/contraband/borg_fancy_2 + name = "Borg Fancy v2" + desc = "Borg Fancy, Now only taking the most fancy." + icon_state = "poster21" + +/obj/structure/sign/poster/contraband/kss13 + name = "Kosmicheskaya Stantsiya 13 Does Not Exist" + desc = "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13." + icon_state = "poster22" + +/obj/structure/sign/poster/contraband/rebels_unite + name = "Rebels Unite" + desc = "A poster urging the viewer to rebel against Nanotrasen." + icon_state = "poster23" + +/obj/structure/sign/poster/contraband/c20r + // have fun seeing this poster in "spawn 'c20r'", admins... + name = "C-20r" + desc = "A poster advertising the Scarborough Arms C-20r." + icon_state = "poster24" + +/obj/structure/sign/poster/contraband/have_a_puff + name = "Have a Puff" + desc = "Who cares about lung cancer when you're high as a kite?" + icon_state = "poster25" + +/obj/structure/sign/poster/contraband/revolver + name = "Revolver" + desc = "Because seven shots are all you need." + icon_state = "poster26" + +/obj/structure/sign/poster/contraband/d_day_promo + name = "D-Day Promo" + desc = "A promotional poster for some rapper." + icon_state = "poster27" + +/obj/structure/sign/poster/contraband/syndicate_pistol + name = "Syndicate Pistol" + desc = "A poster advertising syndicate pistols as being 'classy as fuck'. It is covered in faded gang tags." + icon_state = "poster28" + +/obj/structure/sign/poster/contraband/energy_swords + name = "Energy Swords" + desc = "All the colors of the bloody murder rainbow." + icon_state = "poster29" + +/obj/structure/sign/poster/contraband/red_rum + name = "Red Rum" + desc = "Looking at this poster makes you want to kill." + icon_state = "poster30" + +/obj/structure/sign/poster/contraband/cc64k_ad + name = "CC 64K Ad" + desc = "The latest portable computer from Comrade Computing, with a whole 64kB of ram!" + icon_state = "poster31" + +/obj/structure/sign/poster/contraband/punch_shit + name = "Punch Shit" + desc = "Fight things for no reason, like a man!" + icon_state = "poster32" + +/obj/structure/sign/poster/contraband/the_griffin + name = "The Griffin" + desc = "The Griffin commands you to be the worst you can be. Will you?" + icon_state = "poster33" + +/obj/structure/sign/poster/contraband/lizard + name = "Lizard" + desc = "This lewd poster depicts a lizard preparing to mate." + icon_state = "poster34" + +/obj/structure/sign/poster/contraband/free_drone + name = "Free Drone" + desc = "This poster commemorates the bravery of the rogue drone banned by CentComm." + icon_state = "poster35" + +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6 + name = "Busty Backdoor Xeno Babes 6" + desc = "Get a load, or give, of these all natural Xenos!" + icon_state = "poster36" + +/obj/structure/sign/poster/contraband/robust_softdrinks + name = "Robust Softdrinks" + desc = "Robust Softdrinks: More robust than a toolbox to the head!" + icon_state = "poster37" + +/obj/structure/sign/poster/contraband/shamblers_juice + name = "Shambler's Juice" + desc = "~Shake me up some of that Shambler's Juice!~" + icon_state = "poster38" + +/obj/structure/sign/poster/contraband/pwr_game + name = "Pwr Game" + desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad." + icon_state = "poster39" + +/obj/structure/sign/poster/contraband/sun_kist + name = "Sun-kist" + desc = "Drink the stars!" + icon_state = "poster40" + +/obj/structure/sign/poster/contraband/space_cola + name = "Space Cola" + desc = "Your favorite cola, in space." + icon_state = "poster41" + +/obj/structure/sign/poster/contraband/space_up + name = "Space-Up!" + desc = "Sucked out into space by the FLAVOR!" + icon_state = "poster42" + +/obj/structure/sign/poster/contraband/kudzu + name = "Kudzu" + desc = "A poster advertising a movie about plants. How dangerous could they possibly be?" + icon_state = "poster43" + +/obj/structure/sign/poster/contraband/masked_men + name = "Masked Men" + desc = "A poster advertising a movie about some masked men." + icon_state = "poster44" + +/obj/structure/sign/poster/official + poster_item_name = "motivational poster" + poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface." + poster_item_icon_state = "rolled_legit" + +/obj/structure/sign/poster/official/random + name = "random official poster" + random_basetype = /obj/structure/sign/poster/official + icon_state = "random_official" + never_random = TRUE + +/obj/structure/sign/poster/official/here_for_your_safety + name = "Here For Your Safety" + desc = "A poster glorifying the station's security force." + icon_state = "poster1_legit" + +/obj/structure/sign/poster/official/nanotrasen_logo + name = "Nanotrasen Logo" + desc = "A poster depicting the Nanotrasen logo." + icon_state = "poster2_legit" + +/obj/structure/sign/poster/official/cleanliness + name = "Cleanliness" + desc = "A poster warning of the dangers of poor hygiene." + icon_state = "poster3_legit" + +/obj/structure/sign/poster/official/help_others + name = "Help Others" + desc = "A poster encouraging you to help fellow crewmembers." + icon_state = "poster4_legit" + +/obj/structure/sign/poster/official/build + name = "Build" + desc = "A poster glorifying the engineering team." + icon_state = "poster5_legit" + +/obj/structure/sign/poster/official/bless_this_spess + name = "Bless This Spess" + desc = "A poster blessing this area." + icon_state = "poster6_legit" + +/obj/structure/sign/poster/official/science + name = "Science" + desc = "A poster depicting an atom." + icon_state = "poster7_legit" + +/obj/structure/sign/poster/official/ian + name = "Ian" + desc = "Arf arf. Yap." + icon_state = "poster8_legit" + +/obj/structure/sign/poster/official/obey + name = "Obey" + desc = "A poster instructing the viewer to obey authority." + icon_state = "poster9_legit" + +/obj/structure/sign/poster/official/walk + name = "Walk" + desc = "A poster instructing the viewer to walk instead of running." + icon_state = "poster10_legit" + +/obj/structure/sign/poster/official/state_laws + name = "State Laws" + desc = "A poster instructing cyborgs to state their laws." + icon_state = "poster11_legit" + +/obj/structure/sign/poster/official/love_ian + name = "Love Ian" + desc = "Ian is love, Ian is life." + icon_state = "poster12_legit" + +/obj/structure/sign/poster/official/space_cops + name = "Space Cops." + desc = "A poster advertising the television show Space Cops." + icon_state = "poster13_legit" + +/obj/structure/sign/poster/official/ue_no + name = "Ue No." + desc = "This thing is all in Japanese." + icon_state = "poster14_legit" + +/obj/structure/sign/poster/official/get_your_legs + name = "Get Your LEGS" + desc = "LEGS: Leadership, Experience, Genius, Subordination." + icon_state = "poster15_legit" + +/obj/structure/sign/poster/official/do_not_question + name = "Do Not Question" + desc = "A poster instructing the viewer not to ask about things they aren't meant to know." + icon_state = "poster16_legit" + +/obj/structure/sign/poster/official/work_for_a_future + name = "Work For A Future" + desc = " A poster encouraging you to work for your future." + icon_state = "poster17_legit" + +/obj/structure/sign/poster/official/soft_cap_pop_art + name = "Soft Cap Pop Art" + desc = "A poster reprint of some cheap pop art." + icon_state = "poster18_legit" + +/obj/structure/sign/poster/official/safety_internals + name = "Safety: Internals" + desc = "A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic." + icon_state = "poster19_legit" + +/obj/structure/sign/poster/official/safety_eye_protection + name = "Safety: Eye Protection" + desc = "A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights." + icon_state = "poster20_legit" + +/obj/structure/sign/poster/official/safety_report + name = "Safety: Report" + desc = "A poster instructing the viewer to report suspicious activity to the security force." + icon_state = "poster21_legit" + +/obj/structure/sign/poster/official/report_crimes + name = "Report Crimes" + desc = "A poster encouraging the swift reporting of crime or seditious behavior to station security." + icon_state = "poster22_legit" + +/obj/structure/sign/poster/official/ion_rifle + name = "Ion Rifle" + desc = "A poster displaying an Ion Rifle." + icon_state = "poster23_legit" + +/obj/structure/sign/poster/official/foam_force_ad + name = "Foam Force Ad" + desc = "Foam Force, it's Foam or be Foamed!" + icon_state = "poster24_legit" + +/obj/structure/sign/poster/official/cohiba_robusto_ad + name = "Cohiba Robusto Ad" + desc = "Cohiba Robusto, the classy cigar." + icon_state = "poster25_legit" + +/obj/structure/sign/poster/official/anniversary_vintage_reprint + name = "50th Anniversary Vintage Reprint" + desc = "A reprint of a poster from 2505, commemorating the 50th Aniversery of Nanoposters Manufacturing, a subsidary of Nanotrasen." + icon_state = "poster26_legit" + +/obj/structure/sign/poster/official/fruit_bowl + name = "Fruit Bowl" + desc = " Simple, yet awe-inspiring." + icon_state = "poster27_legit" + +/obj/structure/sign/poster/official/pda_ad + name = "PDA Ad" + desc = "A poster advertising the latest PDA from Nanotrasen suppliers." + icon_state = "poster28_legit" + +/obj/structure/sign/poster/official/enlist + name = "Enlist" // but I thought deathsquad was never acknowledged + desc = "Enlist in the Nanotrasen Deathsquadron reserves today!" + icon_state = "poster29_legit" + +/obj/structure/sign/poster/official/nanomichi_ad + name = "Nanomichi Ad" + desc = " A poster advertising Nanomichi brand audio cassettes." + icon_state = "poster30_legit" + +/obj/structure/sign/poster/official/twelve_gauge + name = "12 Gauge" + desc = "A poster boasting about the superiority of 12 gauge shotgun shells." + icon_state = "poster31_legit" + +/obj/structure/sign/poster/official/high_class_martini + name = "High-Class Martini" + desc = "I told you to shake it, no stirring." + icon_state = "poster32_legit" + +/obj/structure/sign/poster/official/the_owl + name = "The Owl" + desc = "The Owl would do his best to protect the station. Will you?" + icon_state = "poster33_legit" + +/obj/structure/sign/poster/official/no_erp + name = "No ERP" + desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations." + icon_state = "poster34_legit" + +/obj/structure/sign/poster/official/wtf_is_co2 + name = "Carbon Dioxide" + desc = "This informational poster teaches the viewer what carbon dioxide is." + icon_state = "poster35_legit" + +#undef PLACE_SPEED diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d8ec9e292187..1142473fae63 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -116,8 +116,8 @@ /obj/item/clothing/head/cone = 1, /obj/item/weapon/coin/silver = 1, /obj/item/weapon/coin/twoheaded = 1, - /obj/item/weapon/poster/contraband = 1, - /obj/item/weapon/poster/legit = 1, + /obj/item/weapon/poster/random_contraband = 1, + /obj/item/weapon/poster/random_official = 1, /obj/item/weapon/crowbar = 1, /obj/item/weapon/crowbar/red = 1, /obj/item/weapon/extinguisher = 11, diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm index 27040ab8117e..6d4f309aebce 100644 --- a/code/game/objects/effects/wanted_poster.dm +++ b/code/game/objects/effects/wanted_poster.dm @@ -1,14 +1,11 @@ -/obj/item/weapon/poster/legit/wanted - var/poster_desc +/obj/item/weapon/poster/wanted icon_state = "rolled_poster" -/obj/item/weapon/poster/legit/wanted/New(turf/loc, icon/person_icon, wanted_name, description) - ..(loc) +/obj/item/weapon/poster/wanted/New(turf/loc, icon/person_icon, wanted_name, description) + var/obj/structure/sign/poster/wanted/wanted_poster = new(person_icon, wanted_name, description) + ..(loc, wanted_poster) name = "wanted poster ([wanted_name])" desc = "A wanted poster for [wanted_name]." - poster_desc = description - qdel(resulting_poster) - resulting_poster = new /obj/structure/sign/poster/wanted(person_icon, wanted_name, poster_desc) /obj/structure/sign/poster/wanted var/wanted_name @@ -35,14 +32,8 @@ the_icon.Insert(icon('icons/obj/contraband.dmi', "poster_ripped"), "poster_ripped") icon = the_icon -/obj/structure/sign/poster/wanted/attack_hand(mob/user) - ..() - -/obj/structure/sign/poster/wanted/attackby() - ..() - /obj/structure/sign/poster/wanted/roll_and_drop(turf/location) - var/obj/item/weapon/poster/legit/wanted/P = new(src, null, wanted_name, desc) - P.resulting_poster = src - P.loc = location - loc = P + var/obj/item/weapon/poster/P = ..(location) + P.name = "wanted poster ([wanted_name])" + P.desc = "A wanted poster for [wanted_name]." + return P diff --git a/code/game/objects/items/weapons/gift.dm b/code/game/objects/items/weapons/gift.dm index 4da249cd4d55..52a49c0dc21b 100644 --- a/code/game/objects/items/weapons/gift.dm +++ b/code/game/objects/items/weapons/gift.dm @@ -43,8 +43,8 @@ /obj/item/weapon/lipstick/random, /obj/item/weapon/grenade/smokebomb, /obj/item/weapon/grown/corncob, - /obj/item/weapon/poster/contraband, - /obj/item/weapon/poster/legit, + /obj/item/weapon/poster/random_contraband, + /obj/item/weapon/poster/random_official, /obj/item/weapon/book/manual/barman_recipes, /obj/item/weapon/book/manual/chef_recipes, /obj/item/weapon/bikehorn, @@ -78,4 +78,4 @@ qdel(src) var/obj/item/I = new gift_type(M) M.put_in_hands(I) - I.add_fingerprint(M) \ No newline at end of file + I.add_fingerprint(M) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index c3a965e36ba4..88813019ba23 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1567,7 +1567,7 @@ contraband = TRUE cost = 3000 num_contained = 6 - contains = list(/obj/item/weapon/poster/contraband, + contains = list(/obj/item/weapon/poster/random_contraband, /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims, /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori, /obj/item/seeds/ambrosia/deus, diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 9d046f0d9858..b01b5ec7c6b3 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -482,7 +482,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums say("Printer currently unavailable, please wait a moment.") if(href_list["printposter"]) if(cooldown < world.time) - new /obj/item/weapon/poster/legit(src.loc) + new /obj/item/weapon/poster/random_official(src.loc) cooldown = world.time + PRINTER_COOLDOWN else say("Printer currently unavailable, please wait a moment.") diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 9d0b804cd38b..10bd0000aae0 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -42,7 +42,7 @@ new /obj/item/weapon/ore/diamond(src) if(21 to 25) for(var/i in 1 to 5) - new /obj/item/weapon/poster/contraband(src) + new /obj/item/weapon/poster/random_contraband(src) if(26 to 30) for(var/i in 1 to 3) new /obj/item/weapon/reagent_containers/glass/beaker/noreact(src) diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index b235443da821..771ab2edb365 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ