diff --git a/html/changelogs/Bat-Assunzione2.yml b/html/changelogs/Bat-Assunzione2.yml new file mode 100644 index 00000000000..a6daec32c45 --- /dev/null +++ b/html/changelogs/Bat-Assunzione2.yml @@ -0,0 +1,4 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - bugfix: "Many, many minor improvements and bugfixes in Port Volturno based on observation of Event round." diff --git a/maps/away/away_site/assunzione/port_volturno/port_volturno.dmm b/maps/away/away_site/assunzione/port_volturno/port_volturno.dmm index c7090a1a00e..86affc65bef 100644 --- a/maps/away/away_site/assunzione/port_volturno/port_volturno.dmm +++ b/maps/away/away_site/assunzione/port_volturno/port_volturno.dmm @@ -949,6 +949,10 @@ /obj/structure/curtain/open/bar{ pixel_x = -32 }, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ + pixel_y = 13 + }, /turf/simulated/floor/wood/maple, /area/port_volturno/interior/music_store) "aNH" = ( @@ -1460,6 +1464,7 @@ /area/port_volturno/exterior) "bjD" = ( /obj/structure/flora/assunzione/bush/lucevine, +/obj/effect/decal/curb, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "bkj" = ( @@ -1675,8 +1680,6 @@ /turf/simulated/floor/tiled, /area/port_volturno/interior/clinic/storage) "bsz" = ( -/obj/structure/flora/assunzione/grass/sparse, -/obj/structure/flora/assunzione/bush/ferny, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "bsM" = ( @@ -2193,8 +2196,10 @@ /turf/simulated/floor/tiled, /area/port_volturno/interior/minimart) "bLA" = ( -/obj/structure/flora/bush/mushroom, -/obj/structure/flora/assunzione/grass/full, +/obj/structure/flora/assunzione/flowers/lavendergrass, +/obj/effect/decal/curb{ + dir = 1 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "bLD" = ( @@ -2981,13 +2986,11 @@ /turf/simulated/floor/sidewalk/assunzione, /area/port_volturno/exterior) "cra" = ( -/obj/structure/flora/assunzione/bush/ferny, -/obj/structure/flora/assunzione/flowers/ywflowers, -/obj/effect/decal/curb{ - dir = 8 +/obj/machinery/door/blast/shutters{ + id = "restaurant"; + dir = 4 }, -/obj/structure/flora/assunzione/bush/lucevine, -/turf/simulated/floor/grass1/no_edge, +/turf/simulated/wall, /area/port_volturno/interior/stafylia) "crb" = ( /obj/structure/road_barrier, @@ -6056,14 +6059,6 @@ }, /turf/simulated/floor/tiled/cargo/brass/full, /area/port_volturno/interior/riad) -"euU" = ( -/obj/structure/flora/assunzione/grass/full, -/obj/structure/flora/assunzione/flowers/brflowers, -/obj/effect/decal/curb{ - dir = 10 - }, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) "ewa" = ( /obj/item/storage/box/gloves, /obj/structure/table/standard, @@ -6191,6 +6186,7 @@ dir = 4 }, /obj/effect/decal/rolling_fog, +/obj/structure/flora/assunzione/bush/lucevine, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior) "eBO" = ( @@ -7047,30 +7043,18 @@ /obj/item/reagent_containers/food/snacks/donerkebab, /obj/item/reagent_containers/food/snacks/donerkebab, /obj/item/reagent_containers/food/snacks/donerkebab, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/cherry_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, +/obj/item/storage/box/fancy/yoke/cherry_juice, +/obj/item/storage/box/fancy/yoke/cherry_juice, +/obj/item/storage/box/fancy/yoke/cherry_juice, +/obj/item/storage/box/fancy/yoke/grape_juice, +/obj/item/storage/box/fancy/yoke/grape_juice, +/obj/item/storage/box/fancy/yoke/grape_juice, +/obj/item/storage/box/fancy/yoke/grape_juice, +/obj/item/storage/box/fancy/yoke/cherry_juice, +/obj/item/storage/box/fancy/yoke/peach_soda, +/obj/item/storage/box/fancy/yoke/peach_soda, +/obj/item/storage/box/fancy/yoke/peach_soda, +/obj/item/storage/box/fancy/yoke/peach_soda, /turf/simulated/floor/tiled/ridged, /area/port_volturno/interior/stafylia) "fhw" = ( @@ -7152,11 +7136,15 @@ /turf/simulated/floor/exoplanet/assunzione, /area/port_volturno/interior/maintenance) "fkf" = ( -/obj/structure/flora/assunzione/grass, -/obj/structure/flora/assunzione/flowers/brflowers, -/obj/effect/decal/curb, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) +/obj/structure/bed/stool/chair/office/light{ + dir = 4 + }, +/obj/effect/ghostspawpoint{ + name = "igs - assunzione_cop"; + identifier = "assunzione_cop" + }, +/turf/simulated/floor/wood/maple, +/area/port_volturno/interior/police) "fkF" = ( /obj/machinery/light/spot{ dir = 1 @@ -7512,10 +7500,13 @@ /turf/simulated/floor, /area/port_volturno/interior/spaceport) "fAp" = ( -/obj/structure/flora/assunzione/flowers/lavendergrass, -/obj/structure/flora/assunzione/grass/full, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) +/obj/random/dirt_75, +/obj/structure/closet/crate/bin/urban/compact{ + pixel_y = 24; + density = 0 + }, +/turf/simulated/floor/tiled/cargo/brass/full, +/area/port_volturno/interior/riad) "fAs" = ( /obj/structure/tank_wall/air{ density = 0; @@ -7898,6 +7889,42 @@ /area/port_volturno/interior/robotics) "fQu" = ( /obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = -6; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = -6; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = -6; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/bottle/limoncello{ + pixel_x = -6; + pixel_y = 2 + }, /turf/simulated/floor/wood/birch, /area/port_volturno/interior/liquor_store) "fRH" = ( @@ -8306,12 +8333,11 @@ /turf/simulated/floor/asphalt/assunzione, /area/port_volturno/exterior) "gjz" = ( -/obj/effect/step_trigger/thrower{ - tiles = 1; - dir = 4 - }, /obj/random/dirt_75, /obj/effect/decal/rolling_fog, +/obj/effect/step_trigger/thrower{ + tiles = 1 + }, /turf/unsimulated/floor/plating, /area/port_volturno/interior/tram_station) "gke" = ( @@ -8382,18 +8408,14 @@ /turf/simulated/open, /area/port_volturno/exterior) "gmv" = ( -/obj/effect/decal/fake_object{ - icon = 'icons/obj/smoothtrack.dmi'; - icon_state = "track12"; - name = "tram track" - }, -/obj/effect/step_trigger/thrower{ - tiles = 1; - dir = 4 - }, /obj/effect/decal/rolling_fog, -/turf/unsimulated/floor/plating, -/area/port_volturno/interior/tram_station) +/obj/machinery/atm{ + dir = 8; + pixel_x = -16; + pixel_y = 14 + }, +/turf/simulated/floor/sidewalk/assunzione, +/area/port_volturno/exterior) "gmO" = ( /obj/effect/decal/road_marking/no_pass{ dir = 4 @@ -8453,8 +8475,15 @@ /obj/machinery/door/firedoor{ req_one_access = null }, -/obj/machinery/door/urban, -/obj/machinery/door/blast/shutters/open{ +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 + }, +/obj/machinery/door/airlock/security{ + door_color = "#46334d"; + req_access = list(218); + name = "Spaceport Security Office" + }, +/obj/machinery/door/blast/shutters{ id = "police1" }, /turf/simulated/floor/tiled, @@ -8464,6 +8493,9 @@ /obj/effect/decal/curb{ dir = 8 }, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 + }, /turf/simulated/floor/lino, /area/port_volturno/interior/stafylia) "gqn" = ( @@ -8493,7 +8525,12 @@ /area/port_volturno/interior/maintenance) "grl" = ( /obj/structure/closet/chefcloset, -/obj/item/quikpay, +/obj/item/quikpay{ + req_one_access = null + }, +/obj/item/quikpay{ + req_one_access = null + }, /turf/simulated/floor/tiled/ridged, /area/port_volturno/interior/stafylia) "grx" = ( @@ -8916,12 +8953,10 @@ /turf/simulated/floor/sidewalk/flat, /area/port_volturno/interior/maintenance) "gEN" = ( -/obj/structure/flora/assunzione/grass/full, /obj/structure/flora/assunzione/flowers/brflowers, /obj/effect/decal/curb{ - dir = 8 + dir = 9 }, -/obj/structure/flora/assunzione/bush/pale, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "gFl" = ( @@ -9259,7 +9294,9 @@ /area/port_volturno/interior) "gTq" = ( /obj/machinery/door/urban{ - dir = 4 + dir = 4; + req_one_access = list(219); + support_ids = 1 }, /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 4 @@ -11399,6 +11436,9 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/item/quikpay{ + req_one_access = null + }, /turf/simulated/floor/wood/birch, /area/port_volturno/interior/liquor_store) "iGw" = ( @@ -11934,7 +11974,9 @@ /turf/simulated/floor/tiled/cargo/brass/full, /area/port_volturno/interior/riad) "iYV" = ( -/obj/structure/flora/assunzione/grass/full, +/obj/effect/decal/curb{ + dir = 4 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "iZf" = ( @@ -12001,7 +12043,9 @@ /turf/simulated/floor/grass1/no_edge, /area/port_volturno/exterior) "jbS" = ( -/obj/structure/flora/assunzione/flowers/ppflowers, +/obj/effect/decal/curb{ + dir = 8 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "jci" = ( @@ -13295,8 +13339,7 @@ /turf/simulated/floor/asphalt/assunzione, /area/port_volturno/exterior) "keM" = ( -/obj/structure/flora/assunzione/grass/full, -/obj/structure/flora/assunzione/flowers/ywflowers, +/obj/effect/decal/curb/corner, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "keO" = ( @@ -13709,6 +13752,7 @@ /obj/effect/decal/curb{ dir = 6 }, +/obj/structure/flora/assunzione/bush/lucevine, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "kvJ" = ( @@ -13819,8 +13863,12 @@ /obj/structure/closet/crate{ name = "saleable goods" }, -/obj/item/quikpay, -/obj/item/quikpay, +/obj/item/quikpay{ + req_one_access = null + }, +/obj/item/quikpay{ + req_one_access = null + }, /turf/simulated/floor/tiled/full, /area/port_volturno/interior/hotel) "kwG" = ( @@ -14115,6 +14163,7 @@ pixel_x = 4; pixel_y = 6 }, +/obj/item/storage/box/slides, /turf/simulated/floor/tiled/white, /area/port_volturno/interior/police/brig) "kIX" = ( @@ -15286,10 +15335,10 @@ /turf/simulated/open, /area/port_volturno/interior/riad) "luE" = ( -/obj/structure/flora/assunzione/grass/full, -/obj/structure/flora/assunzione/grass/full, -/obj/structure/flora/assunzione/grass, -/turf/simulated/floor/grass1/no_edge, +/obj/effect/decal/curb{ + dir = 10 + }, +/turf/simulated/floor/wood, /area/port_volturno/interior/stafylia) "luH" = ( /obj/effect/decal/curb{ @@ -16099,13 +16148,33 @@ /turf/simulated/open, /area/port_volturno/exterior) "lZG" = ( -/turf/unsimulated/wall/fakepdoor{ - icon_state = "shutter1"; - name = "shutter"; - opacity = 0; - dir = 4 +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/triplesec{ + pixel_y = 16; + pixel_x = 4 }, -/area/port_volturno/interior/stafylia) +/obj/item/reagent_containers/food/drinks/bottle/triplesec{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/bottle/triplesec{ + pixel_y = 16; + pixel_x = 4 + }, +/obj/item/reagent_containers/food/drinks/bottle/triplesec{ + pixel_y = 16; + pixel_x = 4 + }, +/obj/item/reagent_containers/food/drinks/bottle/triplesec{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/bottle/triplesec{ + pixel_x = -4; + pixel_y = 8 + }, +/turf/simulated/floor/wood/birch, +/area/port_volturno/interior/liquor_store) "lZI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -17943,6 +18012,9 @@ dir = 4 }, /obj/structure/flora/assunzione/bush/ferny, +/obj/effect/decal/curb{ + dir = 8 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "nFI" = ( @@ -18054,11 +18126,7 @@ /turf/simulated/floor/grass1/no_edge, /area/port_volturno/exterior) "nJp" = ( -/obj/machinery/door/blast/shutters{ - id = "restaurant"; - dir = 4 - }, -/turf/simulated/wall, +/turf/simulated/floor/tiled/slate/full, /area/port_volturno/interior/stafylia) "nJu" = ( /obj/effect/decal/rolling_fog, @@ -18323,13 +18391,18 @@ /turf/simulated/floor, /area/port_volturno/interior/spaceport) "nSz" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/table/wood, +/obj/structure/curtain/open/bar{ + pixel_x = -32 }, -/obj/effect/decal/curb, -/obj/random/dirt_75, -/turf/simulated/floor/wood, -/area/port_volturno/interior/stafylia) +/obj/item/quikpay{ + req_one_access = null + }, +/obj/item/quikpay{ + req_one_access = null + }, +/turf/simulated/floor/wood/maple, +/area/port_volturno/interior/music_store) "nSN" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -19081,12 +19154,10 @@ /turf/simulated/floor/wood, /area/port_volturno/interior/riad) "opm" = ( -/obj/structure/flora/assunzione/grass/sparse, -/obj/structure/flora/assunzione/bush/ferny, /obj/effect/decal/curb{ - dir = 1 + dir = 9 }, -/turf/simulated/floor/grass1/no_edge, +/turf/simulated/floor/wood, /area/port_volturno/interior/stafylia) "opp" = ( /obj/effect/decal/curb{ @@ -19321,7 +19392,7 @@ /obj/machinery/door/firedoor{ req_one_access = null }, -/obj/machinery/door/blast/shutters/open{ +/obj/machinery/door/blast/shutters{ id = "police1" }, /turf/simulated/floor/tiled, @@ -19561,8 +19632,11 @@ /turf/simulated/floor/asphalt/assunzione, /area/port_volturno/exterior) "oJb" = ( -/obj/structure/closet/crate/bin, +/obj/effect/decal/curb, /obj/random/dirt_75, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/wood, /area/port_volturno/interior/stafylia) "oJz" = ( @@ -19648,17 +19722,12 @@ /turf/simulated/floor/sidewalk/assunzione/blocks, /area/port_volturno/exterior) "oLW" = ( -/obj/machinery/door/firedoor{ - req_one_access = null +/obj/structure/flora/assunzione/flowers/lavendergrass, +/obj/effect/decal/curb{ + dir = 4 }, -/obj/effect/floor_decal/industrial/hatch_door/yellow{ - dir = 8 - }, -/obj/machinery/door/urban{ - req_access = list(219) - }, -/turf/simulated/floor/tiled/cargo/brass/full, -/area/port_volturno/interior/clothing_store) +/turf/simulated/floor/grass1/no_edge, +/area/port_volturno/interior/stafylia) "oMh" = ( /obj/structure/arch/gothic/northsouth/lower, /turf/simulated/open, @@ -20499,34 +20568,12 @@ /turf/simulated/floor/tiled/cargo/brass/full, /area/port_volturno/interior/minimart) "pqF" = ( -/obj/effect/decal/fake_object{ - color = "#ff0000"; - dir = 4; - icon = 'icons/atmos/pipes.dmi'; - icon_state = "intact-scrubbers"; - name = "pipe" +/obj/structure/sign/nosmoking_1{ + pixel_x = -32; + pixel_y = -32 }, -/obj/effect/decal/fake_object{ - color = "#0000ff"; - dir = 4; - icon = 'icons/atmos/pipes.dmi'; - icon_state = "intact-supply"; - name = "pipe" - }, -/obj/effect/decal/fake_object{ - color = "#ff0000"; - icon = 'icons/obj/power_cond_white.dmi'; - icon_state = "4-8"; - name = "cable" - }, -/obj/effect/step_trigger/thrower{ - tiles = 1; - dir = 4 - }, -/obj/random/dirt_75, -/obj/effect/decal/rolling_fog, -/turf/unsimulated/floor/plating, -/area/port_volturno/interior/tram_station) +/turf/simulated/floor/wood, +/area/port_volturno/interior/stafylia) "pqO" = ( /obj/structure/bed/stool/chair/office/light{ dir = 4 @@ -22134,10 +22181,13 @@ /turf/simulated/floor/asphalt/assunzione, /area/port_volturno/exterior) "qya" = ( -/obj/structure/flora/assunzione/grass, -/obj/structure/flora/assunzione/grass/full, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 8; + pixel_x = -5 + }, +/turf/simulated/floor/wood/maple, +/area/port_volturno/interior/police) "qyd" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -22198,8 +22248,9 @@ /turf/simulated/floor/tiled/cargo/brass/full, /area/port_volturno/interior/music_store) "qAR" = ( -/obj/structure/flora/assunzione/grass/full, -/obj/structure/flora/assunzione/grass/full, +/obj/effect/decal/curb{ + dir = 1 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "qAV" = ( @@ -22939,14 +22990,17 @@ pixel_y = 12; pixel_x = -6 }, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled, /area/port_volturno/interior/police) "reS" = ( -/obj/effect/step_trigger/thrower{ - tiles = 1; - dir = 8 - }, /obj/random/dirt_75, +/obj/effect/step_trigger/thrower{ + tiles = 1 + }, /obj/effect/decal/rolling_fog, /turf/unsimulated/floor/plating, /area/port_volturno/interior/tram_station) @@ -23989,15 +24043,6 @@ }, /turf/simulated/floor/tiled/white, /area/port_volturno/interior/minimart) -"rVY" = ( -/obj/structure/flora/assunzione/flowers/lavendergrass, -/obj/structure/flora/assunzione/flowers/ywflowers, -/obj/structure/flora/assunzione/grass/full, -/obj/effect/decal/curb{ - dir = 1 - }, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) "rWn" = ( /obj/structure/ledge{ dir = 1 @@ -24182,6 +24227,7 @@ /obj/effect/decal/curb{ dir = 4 }, +/obj/structure/flora/assunzione/bush/pale, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "sfw" = ( @@ -24346,13 +24392,17 @@ /turf/simulated/floor/wood/maple, /area/port_volturno/interior/riad) "sli" = ( -/obj/machinery/door/urban, /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, /obj/machinery/door/firedoor{ req_one_access = null }, +/obj/machinery/door/airlock/security{ + door_color = "#46334d"; + req_access = list(218); + name = "Spaceport Security Office" + }, /turf/simulated/floor/tiled/cargo/brass/full, /area/port_volturno/interior/police) "slz" = ( @@ -25027,11 +25077,6 @@ /obj/effect/decal/rolling_fog, /turf/simulated/floor/tiled/cargo/brass, /area/port_volturno/interior/tram_station) -"sSJ" = ( -/obj/structure/flora/assunzione/flowers/ppflowers, -/obj/structure/flora/assunzione/grass/sparse, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) "sSR" = ( /obj/effect/decal/road_marking/thin, /obj/effect/decal/curb/corner{ @@ -26036,10 +26081,10 @@ /turf/simulated/floor/tiled/white, /area/port_volturno/interior/police/brig) "tFc" = ( -/obj/structure/flora/assunzione/grass, /obj/structure/flora/assunzione/flowers/lavendergrass, -/obj/effect/decal/curb, -/obj/structure/flora/assunzione/bush/lucevine, +/obj/effect/decal/curb{ + dir = 10 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "tFw" = ( @@ -26530,7 +26575,6 @@ /obj/effect/decal/curb{ dir = 4 }, -/obj/structure/flora/assunzione/bush/pale, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "tUy" = ( @@ -28831,7 +28875,7 @@ /obj/machinery/door/firedoor{ req_one_access = null }, -/obj/machinery/door/blast/shutters/open{ +/obj/machinery/door/blast/shutters{ id = "police1" }, /turf/simulated/floor/tiled, @@ -29041,13 +29085,13 @@ /obj/machinery/door/firedoor{ req_one_access = null }, -/obj/machinery/door/urban/glass_sliding{ - name = "Port Volturno Security" - }, /obj/machinery/door/blast/regular/open{ id = "police2"; dir = 4 }, +/obj/machinery/door/urban/glass_sliding{ + name = "Port Volturno Security" + }, /turf/simulated/floor/lino/diamond, /area/port_volturno/interior/police) "vRx" = ( @@ -29594,6 +29638,12 @@ req_one_access = null }, /obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/item/quikpay{ + req_one_access = null + }, +/obj/item/quikpay{ + req_one_access = null + }, /turf/simulated/floor/tiled/freezer, /area/port_volturno/interior/clinic/pharmacy) "wqu" = ( @@ -30283,6 +30333,10 @@ /obj/effect/decal/curb{ dir = 5 }, +/obj/structure/flora/assunzione/bush/lucevine, +/obj/effect/decal/curb{ + dir = 9 + }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "wVr" = ( @@ -30386,9 +30440,6 @@ pixel_y = 2 }, /obj/effect/decal/rolling_fog, -/obj/structure/ledge{ - dir = 9 - }, /turf/simulated/floor/sidewalk/assunzione/flat, /area/port_volturno/exterior) "xaE" = ( @@ -30530,6 +30581,7 @@ /obj/effect/decal/curb{ dir = 8 }, +/obj/structure/flora/assunzione/bush/lucevine, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) "xhk" = ( @@ -30654,7 +30706,7 @@ /obj/structure/flora/assunzione/bush/ferny, /obj/structure/flora/assunzione/flowers/ywflowers, /obj/effect/decal/curb{ - dir = 8 + dir = 10 }, /turf/simulated/floor/grass1/no_edge, /area/port_volturno/interior/stafylia) @@ -31349,6 +31401,12 @@ /area/port_volturno/interior/tram_station) "xRj" = ( /obj/structure/table/wood, +/obj/item/quikpay{ + req_one_access = null + }, +/obj/item/quikpay{ + req_one_access = null + }, /turf/simulated/floor/lino, /area/port_volturno/interior/minimart) "xRl" = ( @@ -31433,13 +31491,12 @@ /turf/simulated/floor/tiled/gunmetal, /area/port_volturno/interior/music_store) "xWk" = ( -/obj/structure/flora/assunzione/flowers/ywflowers, -/obj/effect/decal/curb{ - dir = 9 +/obj/machinery/atm{ + dir = 1; + pixel_y = 28 }, -/obj/structure/flora/assunzione/bush/lucevine, -/turf/simulated/floor/grass1/no_edge, -/area/port_volturno/interior/stafylia) +/turf/simulated/floor/tiled/cargo/brass/full, +/area/port_volturno/interior/riad) "xWE" = ( /obj/effect/decal/curb, /obj/structure/flora/assunzione/bush/ferny, @@ -31564,13 +31621,13 @@ /obj/machinery/door/firedoor{ req_one_access = null }, -/obj/machinery/door/blast/shutters/open{ - id = "police1" - }, /obj/item/flora/pottedplant_small/luce_vine{ pixel_y = 5; pixel_x = -8 }, +/obj/machinery/door/blast/shutters{ + id = "police1" + }, /turf/simulated/floor/tiled, /area/port_volturno/interior/police) "ybq" = ( @@ -31666,6 +31723,12 @@ /area/port_volturno/interior/tram_station) "yfl" = ( /obj/structure/table/wood, +/obj/item/quikpay{ + req_one_access = null + }, +/obj/item/quikpay{ + req_one_access = null + }, /turf/simulated/floor/wood/maple, /area/port_volturno/interior/clothing_store) "yfp" = ( @@ -50724,7 +50787,7 @@ nya tVM tVM tVM -nJp +cra kSk iQe sgv @@ -51758,7 +51821,7 @@ wPY wPY wPY cja -iUL +pqF iUL jGS fcO @@ -52267,13 +52330,13 @@ tVM ydr etP lcD +iUL qXc dLK dLK dLK qVm iUL -iUL rpz fcO nCL @@ -52524,12 +52587,12 @@ tVM aMh mgX lcD +iUL vcY deK mgX qjj lcD -iUL lzo nVM fcO @@ -52780,12 +52843,12 @@ kyR tVM bAO sPj -lcD -vcY +luE +dLK +opm deK cPt qjj -nSz oJb tVM tVM @@ -53037,8 +53100,8 @@ tVM tVM fcO fcO -fcO -tVM +nJp +nJp fcO fcO fcO @@ -53068,7 +53131,7 @@ eFn eFn eFn oQf -oLW +aQM eRM eRM nNG @@ -53294,8 +53357,8 @@ tVM kvy sfv tUo -hat -sfv +iYV +oLW hat nFF wVl @@ -53550,12 +53613,12 @@ iYB tVM tFc jbS -iYV +jbS keM -luE +bsz qAR -fAp -rVY +etP +etP tVM dFw fcO @@ -53805,14 +53868,14 @@ chZ iYB iYB tVM -fkf -qya -sSJ +deK +mgX +qjj bjD bsz bLA -jbS -opm +aMh +mgX tVM wTM fcO @@ -54062,14 +54125,14 @@ chZ iYB iYB tVM -euU -cra -xgY +deK +cPt +qjj xmL xgY gEN -xgY -xWk +bAO +sPj tVM mIW fcO @@ -54319,13 +54382,13 @@ chZ chZ chZ tVM +fcO +fcO +fcO tVM -tVM -tVM -tVM -tVM -tVM -lZG +fcO +fcO +fcO tVM tVM tVM @@ -56884,7 +56947,7 @@ cIr cIr mAU abi -aNj +nSz aNj kxq eFk @@ -58696,7 +58759,7 @@ uke bgo eYS bOZ -lWD +fAp oqo bOZ xGq @@ -61266,7 +61329,7 @@ rqV ltl mdE bOZ -euF +xWk mEe bOZ xGq @@ -118286,13 +118349,13 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx kRB cZy skZ +qya +skZ +skZ +skZ skZ nzL nzL @@ -118543,13 +118606,13 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx kRB pAj skZ +skZ +skZ +skZ +skZ nzL pGc nzL @@ -118800,10 +118863,10 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx +kRB +jfG +nTF +jfG kRB jfG nTF @@ -119057,10 +119120,10 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx +kRB +mlJ +gCO +htL kRB mlJ gCO @@ -119314,10 +119377,10 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx +kRB +skZ +skZ +ngX kRB skZ skZ @@ -119571,10 +119634,10 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx +kRB +iVd +fkf +koT kRB iVd sWL @@ -119828,10 +119891,10 @@ cQx cQx cQx cQx -cQx -cQx -cQx -cQx +kRB +ggs +nVJ +vjz kRB ggs nVJ @@ -120843,9 +120906,9 @@ tGT nHf uEv tSU -gmv -pqF -cGN +nHf +wTk +dGC gjz usQ usQ @@ -121098,12 +121161,12 @@ gLB nHf tGT nHf -cys +gLB gLB nHf wTk dGC -pnL +gjz fgs eSi xot @@ -121355,12 +121418,12 @@ gLB nHf tGT nHf -cys +gLB gLB nHf wTk dGC -pnL +gjz lNe atu gke @@ -122696,7 +122759,7 @@ sZT uGf fSP bDc -fQu +lZG btF hNA tiU @@ -124232,7 +124295,7 @@ lGZ sLM mds bOZ -sNi +xWk oqo bGU eoM @@ -124444,7 +124507,7 @@ pnL dGC wTk dGC -pnL +gjz xQL eSi mOZ @@ -127528,7 +127591,7 @@ gLB nHf wTk dGC -pnL +gjz pNt mIk lWe @@ -127782,9 +127845,9 @@ tGT nHf uPC tLE -sqp -hbI -byb +nHf +wTk +dGC reS usQ usQ @@ -128042,7 +128105,7 @@ gLB nHf wTk dGC -pnL +reS cQx cQx cQx @@ -129095,7 +129158,7 @@ agK agK nAP cNU -nzi +gmv nzi nzi oFA diff --git a/maps/away/away_site/assunzione/port_volturno/port_volturno_ghostroles.dm b/maps/away/away_site/assunzione/port_volturno/port_volturno_ghostroles.dm index b0d60018ddc..55cfdea878e 100644 --- a/maps/away/away_site/assunzione/port_volturno/port_volturno_ghostroles.dm +++ b/maps/away/away_site/assunzione/port_volturno/port_volturno_ghostroles.dm @@ -5,7 +5,7 @@ desc = "Maintain overall security and adherence to corporate regulations under the dome of Port Volturno. Look the other way if no one gets hurt." tags = list("External") spawnpoints = list("assunzione_cop") - max_count = 2 + max_count = 3 outfit = /obj/outfit/admin/assunzione/cop possible_species = list(SPECIES_HUMAN, SPECIES_IPC,