diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 138f00d81..dda368d93 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -708,7 +708,6 @@ icon_state = "drain"; name = "drain" }, -/obj/structure/closet/crate, /obj/machinery/power/apc{ areastring = "/area/quartermaster/miningdock"; dir = 1; @@ -718,6 +717,7 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/closet/crate/large, /turf/open/floor/plating, /area/quartermaster/miningdock) "acd" = ( @@ -12862,6 +12862,9 @@ pixel_y = 5 }, /obj/item/stock_parts/cell/high/plus, +/obj/structure/sign/poster/official/moth_piping{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/engine/break_room) "cuQ" = ( @@ -58534,6 +58537,9 @@ icon_state = "drain"; name = "drain" }, +/obj/structure/sign/poster/official/moth_hardhat{ + pixel_y = 32 + }, /turf/open/floor/plasteel{ dir = 4; icon_state = "floor_trim" @@ -69539,6 +69545,26 @@ }, /turf/open/floor/plasteel, /area/bridge) +"nES" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ + dir = 8; + name = "air supply pipe" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 4; + name = "scrubbers pipe" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/moth_hardhat{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/fore) "nEY" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/firedoor, @@ -76699,6 +76725,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 9 }, +/obj/structure/sign/poster/official/moth_epi{ + pixel_y = 32 + }, /turf/open/floor/plasteel/white{ dir = 1; icon_state = "plaswhite_plate" @@ -89142,6 +89171,9 @@ /area/security/main) "qWr" = ( /obj/structure/closet/crate, +/obj/structure/sign/poster/official/moth_piping{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/engine/atmos) "qWz" = ( @@ -99109,6 +99141,12 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"sBz" = ( +/obj/structure/sign/poster/official/moth_piping{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "sBA" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -104753,6 +104791,13 @@ icon_state = "plaswhite_traction" }, /area/medical/sleeper) +"tze" = ( +/obj/structure/railing, +/obj/structure/sign/poster/ripped{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "tzi" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -115058,7 +115103,7 @@ }, /area/crew_quarters/dorms/upper) "vlt" = ( -/obj/structure/ore_box, +/obj/structure/closet/crate/large, /turf/open/floor/plating, /area/maintenance/port/aft) "vlB" = ( @@ -117272,6 +117317,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/sign/poster/official/moth_meth{ + pixel_y = 32 + }, /turf/open/floor/plasteel/white{ icon_state = "plaswhite_traction" }, @@ -167628,7 +167676,7 @@ qcr qcr qcr xwc -ydD +nES qcr xwc xwc @@ -172792,7 +172840,7 @@ jjS jtD jCE iiy -jRM +tze yeY xXB xXB @@ -175850,7 +175898,7 @@ sna tEK tEK sna -fcd +sBz fcd vaV tEK diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index e1a9a416a..329567935 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -408,6 +408,21 @@ desc = "A poster advertising a movie about some masked men." icon_state = "poster44" +/obj/structure/sign/poster/contraband/moffuchis_pizza + name = "Moffy's Pizzeria" + desc = "Moffy's Pizzeria™: family style pizza for 2 centuries." + icon_state = "poster45" + +/obj/structure/sign/poster/contraband/donk_co + name = "DONK CO. BRAND MICROWAVEABLE FOOD" + desc = "DONK CO. BRAND MICROWAVABLE FOOD: MADE BY STARVING COLLEGE STUDENTS, FOR STARVING COLLEGE STUDENTS." + icon_state = "poster46" + +/obj/structure/sign/poster/contraband/cybersun_six_hundred + name = "Saibāsan: 600 Years Commemorative Poster" + desc = "An artistic poster commemorating 600 years of continual business for Cybersun Industries." + icon_state = "poster47" + /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." @@ -594,4 +609,29 @@ desc = "This informational poster teaches the viewer what carbon dioxide is." icon_state = "poster35_legit" +/obj/structure/sign/poster/official/moth_hardhat + name = "Safety Moth - Hardhats" + desc = "This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. \"It's like a lamp for your head!\"" + icon_state = "poster36_legit" + +/obj/structure/sign/poster/official/moth_piping + name = "Safety Moth - Piping" + desc = "This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. \"Pipes, not Pumps! Proper pipe placement prevents poor performance!\"" + icon_state = "poster37_legit" + +/obj/structure/sign/poster/official/moth_meth + name = "Safety Moth - Methamphetamine" + desc = "This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. \"Stay close to the target temperature, and never go over!\" ...You shouldn't ever be making this." + icon_state = "poster38_legit" + +/obj/structure/sign/poster/official/moth_epi + name = "Safety Moth - Epinephrine" + desc = "This informational poster uses Safety Moth™ to inform the viewer to help injured/deceased crewmen with their epinephrine injectors. \"Prevent organ rot with this one simple trick!\"" + icon_state = "poster39_legit" + +/obj/structure/sign/poster/official/corporate_perks_vacation + name = "Nanotrasen Corporate Perks: Vacation" + desc = "You wish you were here? You can be, Plan today and get 10% off your next vacation on us." + icon_state = "poster40_legit" + #undef PLACE_SPEED diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 08bd86e80..9776b5b42 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index b753093c3..57240ad24 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index b99429aee..1f828a6ee 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index d9a3e0998..626868847 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 05885071c..7b22de0a5 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 089a87882..146b852f9 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 6ecd4f4fc..357691a9d 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 0f07a374a..d6b5ff705 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ