From f2a217d7e357195288d8e07b78978afc5c1297a0 Mon Sep 17 00:00:00 2001 From: Ldip999 <60290575+Ldip999@users.noreply.github.com> Date: Sat, 15 Apr 2023 20:21:52 +0200 Subject: [PATCH 1/2] Adds fax machine to meta --- .../MetaStation/MetaStation_bubber.dmm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation_bubber.dmm b/_maps/map_files/MetaStation/MetaStation_bubber.dmm index 2abbe1b900e..7cbb664ac80 100644 --- a/_maps/map_files/MetaStation/MetaStation_bubber.dmm +++ b/_maps/map_files/MetaStation/MetaStation_bubber.dmm @@ -21043,7 +21043,7 @@ /area/station/science/research) "hCZ" = ( /obj/effect/spawner/random/structure/girder{ - loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50); + loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50); name = "falsewall or wall spawner" }, /turf/open/floor/plating, @@ -35272,7 +35272,7 @@ /area/station/service/hydroponics/garden) "mou" = ( /obj/effect/spawner/random/structure/girder{ - loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50); + loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50); name = "falsewall or wall spawner" }, /turf/open/floor/plating, @@ -43901,7 +43901,7 @@ extra_price = 10; fair_market_price = 10; name = "\improper Warden's Hot Drinks"; - premium = list(/obj/item/seeds/coffee = 2, /obj/item/seeds/coffee/robusta = 2, /obj/item/seeds/tea = 2) + premium = list(/obj/item/seeds/coffee=2,/obj/item/seeds/coffee/robusta=2,/obj/item/seeds/tea=2) }, /turf/open/floor/iron/dark, /area/station/security/prison/rec) @@ -45807,7 +45807,7 @@ desc = "A well-stocked supply point full of robust tools to protect one's virginity whilst incarcerated."; extra_price = 40; name = "\improper Prison Tabletop Society"; - premium = list(/obj/item/pen/fourcolor = 5, /obj/item/rcl = 2, /obj/item/toy/crayon/spraycan = 2, /obj/item/clothing/shoes/wheelys/rollerskates = 3, /obj/item/melee/skateboard = 1); + premium = list(/obj/item/pen/fourcolor=5,/obj/item/rcl=2,/obj/item/toy/crayon/spraycan=2,/obj/item/clothing/shoes/wheelys/rollerskates=3,/obj/item/melee/skateboard=1); product_ads = "Protect your virginity today!;You're already in security's dungeon, now all you need are dragons, and dice!;Either come play some Space Catan, or Chad is going to show you who's the boss of the prison gym again!;Want to be a powergaming fuck AND not get banned? Try TTRPGs today!" }, /obj/structure/cable, @@ -56343,6 +56343,11 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/fax{ + fax_name = "Bridge"; + name = "Bridge Fax Machine"; + pixel_y = 3 + }, /turf/open/floor/iron/dark, /area/station/command/bridge) "tqU" = ( @@ -58183,7 +58188,7 @@ /area/station/security/prison/safe) "tYo" = ( /obj/effect/spawner/random/structure/girder{ - loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50); + loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50); name = "falsewall or wall spawner" }, /turf/open/floor/plating, @@ -65875,7 +65880,7 @@ /area/station/maintenance/starboard/lesser) "wFY" = ( /obj/effect/spawner/random/structure/girder{ - loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50); + loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50); name = "falsewall or wall spawner" }, /turf/open/floor/plating, From 653dc57de6aaea91f317f423d223ecf6c35e9fb4 Mon Sep 17 00:00:00 2001 From: Ldip999 <60290575+Ldip999@users.noreply.github.com> Date: Sun, 16 Apr 2023 18:46:06 +0200 Subject: [PATCH 2/2] Moves the fax out of the way --- .../MetaStation/MetaStation_bubber.dmm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation_bubber.dmm b/_maps/map_files/MetaStation/MetaStation_bubber.dmm index 7cbb664ac80..c98e3999829 100644 --- a/_maps/map_files/MetaStation/MetaStation_bubber.dmm +++ b/_maps/map_files/MetaStation/MetaStation_bubber.dmm @@ -36437,6 +36437,18 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"mGK" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Bridge"; + name = "Bridge Fax Machine"; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "mGX" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -56343,11 +56355,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/fax{ - fax_name = "Bridge"; - name = "Bridge Fax Machine"; - pixel_y = 3 - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "tqU" = ( @@ -98733,7 +98740,7 @@ qkA dUj qVc wNh -veO +mGK hXK duI duI