From cca6851cf00e88c224dabee5f3a3d7f91f665923 Mon Sep 17 00:00:00 2001 From: forwardslashN <150570209+FslashN@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:46:18 -0500 Subject: [PATCH] Minor Fixes and Changes Some more fixing and linter appeasement. Aside from some minor changes here and there, fixes mobs vaulting over south-facing barricades and appropriate ledges so that they are over the thing they are vaulting instead of under it. --- code/__DEFINES/access.dm | 2 +- code/__DEFINES/vendors.dm | 2 +- code/datums/factions/faction.dm | 2 +- code/game/area/WhiskeyOutpost.dm | 24 +- .../jobs/job/civilians/support/synthetic.dm | 4 +- code/game/jobs/job/command/cic/captain.dm | 1 + code/game/jobs/job/command/cic/executive.dm | 1 + code/game/jobs/job/marine/squad/leader.dm | 1 + code/game/jobs/job/marine/squads.dm | 2 +- .../squad_prep/squad_specialist.dm | 2 +- code/game/objects/structures.dm | 15 + .../objects/structures/barricade/barricade.dm | 3 + code/game/objects/structures/blocker.dm | 2 +- code/game/objects/structures/platforms.dm | 26 +- .../modules/cm_marines/equipment/kit_boxes.dm | 4 +- .../maps/Whiskey_Outpost_PvE/nightmare.json | 3 - .../maps/Whiskey_Outpost_PvE/scenario.json | 1 - .../Blackstone_Bridge/Blackstone_Bridge.dmm | 544 +++++++++--------- maps/whiskey_outpost_pve.json | 12 - 19 files changed, 350 insertions(+), 301 deletions(-) delete mode 100644 maps/Nightmare/maps/Whiskey_Outpost_PvE/nightmare.json delete mode 100644 maps/Nightmare/maps/Whiskey_Outpost_PvE/scenario.json delete mode 100644 maps/whiskey_outpost_pve.json diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 6e42b8df67..5b52a79881 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -259,4 +259,4 @@ Blackstone Bridge. //For the Brits. #define ACCESS_LIST_TWE_ALL "TWE (ALL)" -#define ACCESS_LIST_TWE_REGIONS "TWE Access Regions" \ No newline at end of file +#define ACCESS_LIST_TWE_REGIONS "TWE Access Regions" diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 23ce505c97..6c455b7db0 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -68,4 +68,4 @@ //Only relevant in big vendors, like Requisitions or Squad Prep #define VEND_LOAD_AMMO_BOXES (1<<9) //If the vendor has some specialized behavior that needs to override other behavior. Crutch, best to refactor appropriate code. -#define VEND_SPECIALIZED_STOCK (1<<10) \ No newline at end of file +#define VEND_SPECIALIZED_STOCK (1<<10) diff --git a/code/datums/factions/faction.dm b/code/datums/factions/faction.dm index dc67e9cb9a..89f6dccef7 100644 --- a/code/datums/factions/faction.dm +++ b/code/datums/factions/faction.dm @@ -29,7 +29,7 @@ Ovewrite this for individual factions if they get their own ID changing consoles Since there are no proper colonist jobs, instead having survivors, this is defaulted to the marine role list. Update as needed. */ /datum/faction/proc/get_faction_departments(faction_to_check) - if(Check_WO()) + if(Check_WO())//This check is a crutch for now. WO can be removed entirely given that it's pretty old and is mostly replaced by the Remote Outpost. return list( "Command" = ROLES_CIC & ROLES_WO, "Auxiliary Command" = ROLES_AUXIL_SUPPORT & ROLES_WO, diff --git a/code/game/area/WhiskeyOutpost.dm b/code/game/area/WhiskeyOutpost.dm index b2f0509cad..9fea7b3a38 100644 --- a/code/game/area/WhiskeyOutpost.dm +++ b/code/game/area/WhiskeyOutpost.dm @@ -207,12 +207,12 @@ */ /area/whiskey_outpost/blackstone - name = "\improper Whiskey Outpost Blackstone Area" + name = "\improper Blackstone Bridge Area" fake_zlevel = MAP_FAKE_Z_BLACKSTONE_GROUND //So they are not the same as the Almayer fake z's. Stupid, but necessary. sound_environment = SOUND_ENVIRONMENT_GENERIC /* -There are some areas that start out unpowered but can be powered, mostly near the outpost or supply warehouse. They have the "whiskey_outpost" +There are some areas that start out unpowered but can be powered, mostly near the outpost or supply warehouse. They have the "outpost_29" powernet. Everything else isn't really meant to be powered on, though it can be other than the river. These areas are on the "ground" powernet. */ @@ -225,7 +225,7 @@ powernet. /area/whiskey_outpost/blackstone/inside name = "\improper Interior Whiskey Outpost" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" ceiling = CEILING_METAL minimap_color = MINIMAP_AREA_COLONY sound_environment = SOUND_ENVIRONMENT_ROOM @@ -394,7 +394,7 @@ powernet. sound_environment = SOUND_ENVIRONMENT_FOREST /area/whiskey_outpost/blackstone/outside/outpost - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" icon_state = "platform_n" /area/whiskey_outpost/blackstone/outside/outpost/north @@ -517,7 +517,7 @@ powernet. /area/whiskey_outpost/blackstone/outside/bridge icon_state = "platform" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" sound_environment = SOUND_ENVIRONMENT_PARKING_LOT /area/whiskey_outpost/blackstone/outside/bridge/north @@ -554,25 +554,25 @@ powernet. /area/whiskey_outpost/blackstone/outside/bball_court name = "\improper Basketball Court" icon_state = "bball" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" sound_environment = SOUND_ENVIRONMENT_PARKING_LOT /area/whiskey_outpost/blackstone/outside/boxing_ring name = "\improper Boxing Ring" icon_state = "boxing" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" sound_environment = SOUND_ENVIRONMENT_PARKING_LOT /area/whiskey_outpost/blackstone/outside/central_road name = "\improper Central Road" icon_state = "central_road" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" sound_environment = SOUND_ENVIRONMENT_PARKING_LOT /area/whiskey_outpost/blackstone/outside/perimeter_defense name = "\improper Perimeter Defense" icon_state = "perimeter_defense" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" sound_environment = SOUND_ENVIRONMENT_PARKING_LOT //POWERED @@ -580,13 +580,13 @@ powernet. /area/whiskey_outpost/blackstone/outside/mortar_pit name = "\improper Mortar Pit" icon_state = "mortarpit" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" sound_environment = SOUND_ENVIRONMENT_QUARRY /area/whiskey_outpost/blackstone/outside/comm_tower name = "\improper Communication Tower" icon_state = "comms" - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" minimap_color = MINIMAP_AREA_ENGI sound_environment = SOUND_ENVIRONMENT_QUARRY @@ -698,7 +698,7 @@ Just about all underground areas are unpowered and cannot be powered on other th /area/whiskey_outpost/blackstone/underground/maintenance name = "\improper Underground Tunnels" fake_zlevel = MAP_FAKE_Z_BLACKSTONE_BASEMENT - powernet_name = "whiskey_outpost" + powernet_name = "outpost_29" ceiling = CEILING_DEEP_UNDERGROUND minimap_color = MINIMAP_AREA_ENGI soundscape_playlist = SCAPE_PL_ENG diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm index 8f8dcd6880..fd8b128784 100644 --- a/code/game/jobs/job/civilians/support/synthetic.dm +++ b/code/game/jobs/job/civilians/support/synthetic.dm @@ -58,10 +58,10 @@ //Important to have no spacing/tabs in {} blocks as they are rendered directly. /datum/job/civilian/synthetic/uscm_ground/generate_entry_message() . = {"You are a synthetic unit deployed to assist the USCM in one of their remote outposts. You are in charge of engineering and maintenance duties. Make sure the lights stay on. -You may perform other duties and functions as assigned by the officers in charge of the operation. You must obey the chain of command: Outpost Commander followed by the Adjunct Officer, +You may perform other duties and functions as assigned by the officers in charge of the operation. You must obey the chain of command: Outpost Commander followed by the Adjunct Officer. You are not required to follow orders that are clearly dangerous to yourself or others, nonsensical, impossible, or made under duress, even if they come from proper chain of command. -In case of conflicting orders, those higher on the chain of command take priority. Prioritize orders from those higher on the chain of command. +Prioritize orders from those higher on the chain of command. In case of conflicting orders, those higher on the chain of command take priority. Civilian guests are to be treated on the level of senior enlisted personnel (sergeant and above)."} /datum/job/civilian/synthetic/uscm_ground/set_spawn_positions(count) diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm index 40d00316bb..1092d45ae8 100644 --- a/code/game/jobs/job/command/cic/captain.dm +++ b/code/game/jobs/job/command/cic/captain.dm @@ -71,6 +71,7 @@ Godspeed, Captain and Commander!"} flags_startup_parameters = ROLE_ADD_TO_DEFAULT flags_whitelist = NONE gear_preset = /datum/equipment_preset/uscm_ground/oco + prime_priority = TRUE /obj/effect/landmark/start/captain name = JOB_CO diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index b2662bdd45..02020bd1fc 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -34,6 +34,7 @@ AddTimelock(/datum/job/command/executive, list( title = JOB_USCM_GROUND_AO flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ground/ao + prime_priority = TRUE /obj/effect/landmark/start/executive name = JOB_XO diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index 6b43b4caf7..6e832a7bcd 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -28,6 +28,7 @@ gear_preset_secondary = /datum/equipment_preset/uscm/leader/uscm_ground/lesser_rank total_positions = 2 spawn_positions = 2 + prime_priority = TRUE entry_message_body = "You were deemed competent enough to lead a platoon, act accordingly. Make sure your platoon is at task, and correct them if they are not. Delegate to your squad leaders, but let them breathe. Communicate with officers in charge of the outpost and follow their instructions." /datum/job/marine/leader/whiskey diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index b009a68ca4..1ef907b8c8 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -737,7 +737,7 @@ if(JOB_SQUAD_LEADER) num_leaders-- -//proc for promoting a Platoon Leader. Moved with away from OW code as it really should be here instead. Also refactored to a degree. +//proc for promoting a Platoon Leader. Moved away from OW code as it really should be here instead. Also refactored to a degree. /datum/squad/proc/promote_squad_leader(mob/living/carbon/human/selected_sl) var/mob/living/carbon/human/old_lead = squad_leader if(old_lead) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 34f4939be1..492c4c8928 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list( //A special...specialist vendor with actual inventory instead of points. We're old school here. Could maybe even rig it for tokens in the future. /obj/structure/machinery/cm_vending/sorted/spec name = "\improper ColMarTech Specialist Field Testing Gear Rack" - desc = "An automated gear rack for Squad Weapons Specialists. Has a small selection of equipment meant for field testing or limited use." + desc = "An automated gear rack for Outpost Weapons Specialists. Has a small selection of equipment meant for field testing or limited use." icon_state = "spec_gear" vend_flags = VEND_TO_HAND|VEND_LIMITED_INVENTORY|VEND_SPECIALIZED_STOCK|VEND_USE_VENDOR_FLAGS vendor_role = list(JOB_SQUAD_SPECIALIST) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 95998d5de7..a845a245c0 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -10,6 +10,7 @@ var/list/debris var/unslashable = FALSE var/wrenchable = FALSE + var/climb_layer //If it has a "climb" layer that the mob has to be over to look right climbing. Mostly for platforms. health = 100 anchored = TRUE projectile_coverage = PROJECTILE_COVERAGE_MEDIUM @@ -139,10 +140,24 @@ user.visible_message(SPAN_WARNING(climb_string)) var/list/grabbed_things = list() + //var/original_layer for(var/obj/item/grab/grabbing in list(user.l_hand, user.r_hand)) grabbed_things += grabbing.grabbed_thing + /* + Safety in case our layer doesn't reset in time. Not entirely safe, but with a short reset timer, it should. But you never know. + Can also cause issues if we're somehow in a logic fail of going from one thing to another thing with a higher climb_layer. Again, hopefully never comes up. + Xeno large sprites are still entirely cursed when it comes to layering so I am not going to bother trying to fix that. Vehicles too, unfortunately. + */ + if(climb_layer && climb_layer > grabbing.grabbed_thing.layer) + addtimer(VARSET_CALLBACK(grabbing.grabbed_thing, layer, grabbing.grabbed_thing.layer), 0.3 SECONDS) + grabbing.grabbed_thing.layer = climb_layer + grabbing.grabbed_thing.forceMove(user.loc) + if(climb_layer && climb_layer > user.layer) + addtimer(VARSET_CALLBACK(user, layer, user.layer), 0.3 SECONDS) + user.layer = climb_layer user.forceMove(TT) + for(var/atom/movable/thing as anything in grabbed_things) // grabbed things aren't moved to the tile immediately to: make the animation better, preserve the grab thing.forceMove(TT) diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 5a72ec33ea..f2a7843051 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -78,10 +78,13 @@ switch(dir) if(SOUTH) layer = ABOVE_MOB_LAYER + climb_layer = layer if(NORTH) layer = initial(layer) - 0.01 + climb_layer = null else layer = initial(layer) + climb_layer = null if(!anchored) layer = initial(layer) else diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index a15f475b71..263fa0c134 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -149,7 +149,7 @@ GLOBAL_VAR_INIT(vehicle_blockers, TRUE) if(invisibility) //It is invisible. invisibility = 0 //Immediately make it visible. if(play_sound) - playsound(src, 'sound/effects/rocks_falling.ogg', 75, FALSE) + playsound(src, 'sound/effects/rocks_falling.ogg', 70, FALSE) visible_message(SPAN_LARGE(SPAN_WARNING("Rocks fall, stones tremble, as a dense pile of debris forms nearby!")), SPAN_WARNING("You hear something collapse and crumble nearby!")) animate(src, alpha = 255, 1.5 SECONDS) //15 deciseconds, make it opaque. else diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm index bef163d049..4d9ffb1932 100644 --- a/code/game/objects/structures/platforms.dm +++ b/code/game/objects/structures/platforms.dm @@ -25,22 +25,24 @@ icon_state = "platform_stair_alt" dir = 1 - /obj/structure/platform/Initialize() . = ..() var/image/I = image(icon, src, "platform_overlay", LADDER_LAYER, dir)//ladder layer puts us just above weeds. switch(dir) if(SOUTH) - layer = ABOVE_MOB_LAYER+0.1 + layer = ABOVE_MOB_LAYER+0.1 //This is pretty janky as it means mobs get placed under the platform sprite when climbing *over* it. The alternative is that sprites look weird when standing next to platforms. + climb_layer = layer + 0.1 I.pixel_y = -16 if(NORTH) I.pixel_y = 16 if(EAST) I.pixel_x = 16 layer = ABOVE_MOB_LAYER+0.1 + climb_layer = layer + 0.1 if(WEST) I.pixel_x = -16 layer = ABOVE_MOB_LAYER+0.1 + climb_layer = layer + 0.1 overlays += I /obj/structure/platform/initialize_pass_flags(datum/pass_flags_container/PF) @@ -52,10 +54,26 @@ if(ismob(AM)) do_climb(AM) ..() +/* +/obj/structure/platform/BlockedExitDirs(obj/vehicle/multitile/V, target_dir) + to_world(SPAN_DEBUG("Vehicle exit detected.")) + if(istype(V)) + //if(REVERSE_DIR(dir) == target_dir) + if(dir == target_dir) + to_world(SPAN_DEBUG("Directions match, colliding.")) + return BLOCKED_MOVEMENT + else return NO_BLOCKED_MOVEMENT + return ..() +*/ /obj/structure/platform/BlockedPassDirs(atom/movable/mover, target_dir) - if(istype(mover, /obj/vehicle/multitile)) - return BLOCKED_MOVEMENT +// if(istype(V)) +// if() + + var/obj/vehicle/multitile/V = mover + if(istype(V) && dir == target_dir) + return + var/obj/structure/S = locate(/obj/structure) in get_turf(mover) if(S && S.climbable && !(S.flags_atom & ON_BORDER) && climbable && isliving(mover)) //Climbable objects allow you to universally climb over others diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 2b7d56ff74..cee54cbcb2 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -142,7 +142,7 @@ //Happening. /obj/item/storage/box/spec/B18 name = "\improper B18 heavy armor case" - desc = "A large case containing the experimental B18 armor platform, designed minimize battlefield injury. It's heavy, uncomfortable to wear for more than five minutes, and will probably never leave field testing. It's also very effective. \nDrag this sprite onto yourself to open it up! NOTE: You cannot put items back inside this case." + desc = "A large case containing the experimental B18 armor platform, designed minimize battlefield injury. The B18 system is unlikely to leave field testing due to budget cuts even though it is reported to be highly effective (but uncomfortable to wear). \nDrag this sprite onto yourself to open it up! NOTE: You cannot put items back inside this case." kit_overlay = "b18" /obj/item/storage/box/spec/B18/fill_preset_inventory() @@ -158,7 +158,7 @@ /obj/item/storage/box/spec/sapper name = "\improper Sapper equipment case" - desc = "A large case containing a variety of materials for constructing in the field, defending choke points, and sabotaging enemy fortifications. Comes with an improved sentry turret and other important equipment. \nDrag this sprite onto yourself to open it up! NOTE: You cannot put items back inside this case." + desc = "A large case containing a variety of materials for constructing in the field, defending choke points, and sabotaging enemy fortifications. Comes with an improved, custom-tuned sentry turret and other important equipment. \nDrag this sprite onto yourself to open it up! NOTE: You cannot put items back inside this case." kit_overlay = "grenadier" /obj/item/storage/box/spec/sapper/fill_preset_inventory() diff --git a/maps/Nightmare/maps/Whiskey_Outpost_PvE/nightmare.json b/maps/Nightmare/maps/Whiskey_Outpost_PvE/nightmare.json deleted file mode 100644 index 54c13d429c..0000000000 --- a/maps/Nightmare/maps/Whiskey_Outpost_PvE/nightmare.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "type": "map_sprinkle", "path": "sprinkles/" } -] diff --git a/maps/Nightmare/maps/Whiskey_Outpost_PvE/scenario.json b/maps/Nightmare/maps/Whiskey_Outpost_PvE/scenario.json deleted file mode 100644 index fe51488c70..0000000000 --- a/maps/Nightmare/maps/Whiskey_Outpost_PvE/scenario.json +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm b/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm index ae6ae9f371..20b8650a2b 100644 --- a/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm +++ b/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm @@ -209,7 +209,7 @@ /obj/structure/machinery/defenses/sentry/premade, /turf/open/floor{ dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) "ajs" = ( @@ -877,7 +877,12 @@ /area/whiskey_outpost/blackstone/inside/pillbox/four) "aKY" = ( /obj/structure/closet/secure_closet/cmdcabinet{ - pixel_y = 24 + pixel_y = 24; + access_modified = 1; + req_access = list(63) + }, +/obj/item/book/codebook{ + name = "USCM Outpost 29 Code Book" }, /turf/open/floor/prison{ icon_state = "darkredcorners2"; @@ -2485,19 +2490,19 @@ }, /area/whiskey_outpost/blackstone/inside/bunks) "cfv" = ( -/obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door_control/brbutton/alt{ req_access_txt = "56"; access_modified = 1; name = "toggle outpost lockdown"; id = "Outpost Lockdown"; - pixel_x = -6; - pixel_y = 8 + pixel_x = -4; + pixel_y = 6 }, /obj/item/device/binoculars/range/designator{ pixel_y = 6; pixel_x = 14 }, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison{ dir = 1; icon_state = "darkredfull2" @@ -3565,6 +3570,15 @@ icon_state = "asteroidfloor" }, /area/whiskey_outpost/blackstone/outside/outpost/east) +"cYp" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/whiskey_outpost/blackstone/outside/outpost/south) "cYH" = ( /obj/structure/extinguisher_cabinet/alt{ pixel_y = 28; @@ -4103,9 +4117,6 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/item/device/radio/intercom/uscm_ground{ - pixel_y = 23 - }, /turf/open/floor/prison{ dir = 1; icon_state = "floor_plate" @@ -4167,6 +4178,9 @@ /turf/open/gm/coast/west, /area/whiskey_outpost/blackstone/outside/river) "dvp" = ( +/obj/item/device/radio/intercom/uscm_ground{ + pixel_y = 23 + }, /turf/open/floor/prison{ dir = 2; icon_state = "darkred2" @@ -4923,8 +4937,8 @@ icon_state = "sandbag_0" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 10; + icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) "efr" = ( @@ -5295,7 +5309,10 @@ /area/whiskey_outpost/blackstone/outside/perimeter_defense) "esK" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "asteroidwarning" + }, /area/whiskey_outpost/blackstone/outside/outpost/south) "etz" = ( /obj/effect/decal/cleanable/dirt, @@ -5717,7 +5734,7 @@ dir = 8 }, /turf/open/floor{ - dir = 8; + dir = 9; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) @@ -5767,21 +5784,10 @@ /turf/open/floor/plating, /area/whiskey_outpost/blackstone/underground/maintenance/north_west) "eMg" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/prop/magazine/book/theartofwar{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/prop/flower_vase/bluewhiteflowers{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/prop/helmetgarb/rosary{ - pixel_y = 3 - }, /obj/structure/sign/poster/art{ pixel_y = 31 }, +/obj/structure/machinery/cryopod/right, /turf/open/floor/wood, /area/whiskey_outpost/blackstone/inside/commander_quarters) "eMk" = ( @@ -6030,8 +6036,8 @@ /turf/open/jungle/clear, /area/whiskey_outpost/blackstone/outside/jungle/north) "eUU" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/whiskey_outpost/blackstone/inside/armory/weapons) +/turf/closed/wall/r_wall, +/area/whiskey_outpost/blackstone/underground/mountain/tunnel) "eVa" = ( /obj/item/stack/rods, /turf/open/gm/dirt, @@ -6341,7 +6347,6 @@ /turf/open/gm/dirt, /area/whiskey_outpost/blackstone/outside/outpost_beach/east) "fkB" = ( -/obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/overwatch/uscm_ground{ pixel_y = 6; pixel_x = -5 @@ -6354,6 +6359,7 @@ pixel_x = 9; pixel_y = -3 }, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison{ dir = 1; icon_state = "darkredfull2" @@ -6915,7 +6921,19 @@ }, /area/whiskey_outpost/blackstone/outside/outpost/south) "fIG" = ( -/obj/structure/machinery/cryopod/right, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/prop/magazine/book/theartofwar{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/prop/helmetgarb/rosary{ + pixel_y = 3; + pixel_x = -3 + }, +/obj/item/prop/flower_vase/bluewhiteflowers{ + pixel_x = 8; + pixel_y = 8 + }, /turf/open/floor/wood, /area/whiskey_outpost/blackstone/inside/commander_quarters) "fJv" = ( @@ -7127,12 +7145,9 @@ /turf/open/floor/prison, /area/whiskey_outpost/blackstone/inside/lieutenant_office) "fRj" = ( -/obj/structure/barricade/sandbags/wired, -/obj/structure/barricade/sandbags/wired{ - dir = 8; - icon_state = "sandbag_0" - }, +/obj/structure/barricade/plasteel/wired, /turf/open/floor{ + dir = 4; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) @@ -7521,9 +7536,6 @@ icon_state = "tile" }, /area/whiskey_outpost/blackstone/outside/boxing_ring) -"gkl" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/whiskey_outpost/blackstone/inside/bunks) "gky" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -7762,7 +7774,6 @@ }, /area/whiskey_outpost/blackstone/outside/dorms_island) "gzm" = ( -/obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ pixel_x = -7; pixel_y = 4 @@ -7770,6 +7781,7 @@ /obj/item/folder/black_random{ pixel_x = 6 }, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison, /area/whiskey_outpost/blackstone/inside/combat_information_center) "gzo" = ( @@ -8545,8 +8557,8 @@ dir = 4 }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 8; + icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) "hgD" = ( @@ -8925,10 +8937,8 @@ /turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/blackstone/outside/river) "hAs" = ( -/obj/structure/barricade/sandbags/wired, -/obj/structure/barricade/sandbags/wired{ - dir = 8; - icon_state = "sandbag_0" +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, /turf/open/floor{ dir = 8; @@ -11631,18 +11641,17 @@ /turf/open/asphalt, /area/whiskey_outpost/blackstone/outside/perimeter_defense) "jXu" = ( -/obj/structure/mirror{ - pixel_y = 35 - }, /obj/structure/sink{ - pixel_y = 24; - pixel_x = 1 + dir = 4; + pixel_x = 11 }, -/obj/item/paper/crumpled{ - pixel_x = 7 +/obj/item/tool/soap{ + pixel_x = 12; + pixel_y = -4 }, -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/mirror{ + pixel_y = 26; + pixel_x = -1 }, /turf/open/floor{ icon_state = "white" @@ -11652,7 +11661,6 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/blackstone/inside/commander_office) "jXX" = ( -/obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/squad_changer/uscm_ground{ pixel_x = -12; pixel_y = -5 @@ -11661,6 +11669,7 @@ pixel_y = -5; pixel_x = 5 }, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison, /area/whiskey_outpost/blackstone/inside/combat_information_center) "jYm" = ( @@ -12294,6 +12303,13 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/blackstone/inside/armory) +"kuV" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/floor{ + dir = 10; + icon_state = "asteroidwarning" + }, +/area/whiskey_outpost/blackstone/outside/outpost/south) "kvh" = ( /obj/item/trash/cigbutt{ pixel_y = 10 @@ -13135,7 +13151,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/blackstone/underground/maintenance/north_east) "lfG" = ( -/turf/closed/wall/r_wall/unmeltable, +/turf/closed/wall/r_wall, /area/whiskey_outpost/blackstone/outside/landing_zone) "lgL" = ( /obj/structure/machinery/light/small, @@ -15217,6 +15233,7 @@ icon_state = "sandbag_0" }, /turf/open/floor{ + dir = 6; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) @@ -15906,7 +15923,6 @@ /turf/open/gm/dirt, /area/whiskey_outpost/blackstone/outside/central_road) "nzZ" = ( -/obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/faxmachine/uscm{ pixel_y = 9; pixel_x = -3 @@ -15926,6 +15942,7 @@ phone_id = "Combat Information Center"; pixel_x = 6 }, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison{ dir = 1; icon_state = "darkredfull2" @@ -16166,13 +16183,6 @@ dir = 6 }, /area/whiskey_outpost/blackstone/inside/pillbox/four) -"nJt" = ( -/obj/item/tool/soap{ - pixel_x = -1; - pixel_y = -9 - }, -/turf/closed/wall/r_wall, -/area/whiskey_outpost/blackstone/inside/warehouse) "nJB" = ( /obj/structure/machinery/light/small, /obj/structure/cable/heavyduty{ @@ -16297,6 +16307,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/blackstone/inside/outpost_north) +"nOl" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/whiskey_outpost/blackstone/outside/outpost/south) "nOu" = ( /obj/structure/barricade/metal/wired{ dir = 1 @@ -16746,15 +16765,14 @@ /turf/open/asphalt, /area/whiskey_outpost/blackstone/underground/mountain/tunnel) "omP" = ( -/obj/structure/barricade/sandbags/wired{ - dir = 4; - icon_state = "sandbag_0" +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 4; + icon_state = "asteroidwarning" }, -/area/whiskey_outpost/blackstone/outside/outpost/east) +/area/whiskey_outpost/blackstone/outside/outpost/south) "onf" = ( /obj/structure/platform{ dir = 4 @@ -18113,12 +18131,11 @@ icon_state = "sandbag_0" }, /turf/open/floor{ - dir = 4; + dir = 5; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) "psO" = ( -/obj/structure/surface/table/reinforced/prison, /obj/structure/cable/heavyduty{ icon_state = "1-4" }, @@ -18130,6 +18147,7 @@ pixel_y = 1; pixel_x = 5 }, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison{ dir = 1; icon_state = "darkredfull2" @@ -18207,6 +18225,15 @@ icon_state = "darkyellow2" }, /area/whiskey_outpost/blackstone/inside/warehouse) +"pvD" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/whiskey_outpost/blackstone/outside/outpost/south) "pvZ" = ( /turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/blackstone/outside/boxing_ring) @@ -20035,12 +20062,15 @@ /turf/open/floor/wood, /area/whiskey_outpost/blackstone/inside/commander_office) "rno" = ( -/obj/structure/barricade/sandbags/wired, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/plasteel/wired{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" }, -/area/whiskey_outpost/blackstone/outside/outpost/south) +/area/whiskey_outpost/blackstone/outside/outpost/east) "rnt" = ( /obj/item/trash/tray, /turf/open/jungle/clear, @@ -21437,7 +21467,7 @@ icon_state = "sandbag_0" }, /turf/open/floor{ - dir = 8; + dir = 10; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/west) @@ -22140,9 +22170,6 @@ icon_state = "asteroidfloor" }, /area/whiskey_outpost/blackstone/outside/outpost/south) -"thC" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/whiskey_outpost/blackstone/inside/senior_enlisted_west) "thJ" = ( /obj/structure/largecrate/random/case, /obj/effect/decal/sand_overlay/sand5/corner5, @@ -22449,6 +22476,12 @@ /area/whiskey_outpost/blackstone/outside/perimeter_defense) "tuj" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/paper/crumpled{ + pixel_x = 7 + }, /turf/open/floor{ icon_state = "white" }, @@ -22833,8 +22866,8 @@ "tLK" = ( /obj/structure/barricade/plasteel/wired, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 8; + icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/south) "tMw" = ( @@ -22901,7 +22934,7 @@ icon_state = "sandbag_0" }, /turf/open/floor{ - dir = 4; + dir = 5; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/east) @@ -23779,9 +23812,6 @@ icon_state = "darkredfull2" }, /area/whiskey_outpost/blackstone/inside/armory/weapons) -"uJq" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/whiskey_outpost/blackstone/inside/armory) "uJD" = ( /obj/structure/platform{ dir = 4 @@ -23977,7 +24007,7 @@ icon_state = "sandbag_0" }, /turf/open/floor{ - dir = 4; + dir = 6; icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/outside/outpost/east) @@ -25207,7 +25237,6 @@ /turf/open/jungle/clear, /area/whiskey_outpost/blackstone/outside/jungle/north/east) "vRv" = ( -/obj/structure/surface/table/reinforced/prison, /obj/item/clothing/glasses/hud/health, /obj/item/storage/box/handcuffs{ pixel_x = -8; @@ -25218,6 +25247,7 @@ pixel_y = 13 }, /obj/structure/machinery/light, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/prison, /area/whiskey_outpost/blackstone/inside/combat_information_center) "vRK" = ( @@ -26167,9 +26197,6 @@ /obj/structure/barricade/plasteel/wired, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/blackstone/outside/perimeter_defense) -"wCy" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/whiskey_outpost/blackstone/inside/bunks/bathroom) "wCG" = ( /obj/effect/decal/cleanable/blood/oil{ icon_state = "csplatter1" @@ -27298,16 +27325,15 @@ /turf/open/floor/wood, /area/whiskey_outpost/blackstone/inside/commander_quarters) "xve" = ( -/obj/structure/barricade/sandbags/wired, -/obj/structure/barricade/sandbags/wired{ - dir = 4; - icon_state = "sandbag_0" +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 }, /turf/open/floor{ dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, -/area/whiskey_outpost/blackstone/outside/outpost/south) +/area/whiskey_outpost/blackstone/outside/outpost/east) "xvO" = ( /turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/blackstone/outside/perimeter_defense) @@ -45739,24 +45765,24 @@ fSn fSn fSn fSn -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU +jAV +jAV +jAV +jAV +jAV +jAV +jAV +jAV +jAV +jAV +jAV fSn -thC -thC -thC -thC -thC -thC +gPz +gPz +gPz +gPz +gPz +gPz fSn fSn fSn @@ -45788,7 +45814,7 @@ eJA oqX oqX oqX -hAs +efo btV jfC jZf @@ -45941,7 +45967,7 @@ fSn fSn fSn fSn -eUU +jAV mwy lMO wPi @@ -45951,9 +45977,9 @@ fAt tCK otx mFI -eUU +jAV hAB -thC +gPz fBn bNU iga @@ -46143,7 +46169,7 @@ fSn fSn fSn fSn -eUU +jAV byt byt byt @@ -46153,9 +46179,9 @@ lav agL vSL tzK -eUU +jAV hAB -thC +gPz sie iNj hie @@ -46345,7 +46371,7 @@ fSn fSn fSn fSn -eUU +jAV hqb tCK otx @@ -46355,9 +46381,9 @@ fAt bDj buq uJl -eUU +jAV hAB -thC +gPz iqD uFY hie @@ -46547,7 +46573,7 @@ fSn fSn fSn fSn -eUU +jAV kNB qqI buq @@ -46557,9 +46583,9 @@ uoO agL buq dwl -eUU +jAV hAB -thC +gPz rCO seB hie @@ -46749,7 +46775,7 @@ fSn fSn fSn fSn -eUU +jAV doT bDj buq @@ -46759,9 +46785,9 @@ mUm agL buq lgL -eUU +jAV hAB -thC +gPz bvy xCu oJc @@ -46951,7 +46977,7 @@ fSn fSn fSn fSn -eUU +jAV aBJ agL qlE @@ -46961,10 +46987,10 @@ fAt agL qlE eeG -eUU +jAV hAB -thC -thC +gPz +gPz xTR kgS xTR @@ -47153,7 +47179,7 @@ fSn fSn fSn fSn -eUU +jAV icv agL buq @@ -47163,7 +47189,7 @@ vek agL qlE ljL -eUU +jAV hAB hAB hAB @@ -47353,9 +47379,9 @@ fSn fSn fSn fSn -uJq -uJq -eUU +swv +swv +jAV kpU agL iIA @@ -47401,7 +47427,7 @@ xVI tpt gdK xVI -wrO +kuV abk nEr cmO @@ -47555,7 +47581,7 @@ fSn fSn fSn fSn -uJq +swv kzb gdO kSC @@ -47757,7 +47783,7 @@ fSn fSn fSn fSn -uJq +swv wTu xhd rhh @@ -47798,7 +47824,7 @@ dMN dtP rgp eMg -nxW +lTM wpR rgp amJ @@ -47959,7 +47985,7 @@ fSn fSn fSn fSn -uJq +swv pKd xhd dYD @@ -48000,7 +48026,7 @@ sFf tlt rgp lrO -lTM +nxW fIG rgp vcD @@ -48161,7 +48187,7 @@ fSn fSn fSn fSn -uJq +swv wTu xhd dYD @@ -48363,7 +48389,7 @@ fSn fSn fSn fSn -uJq +swv vbC xhd dYD @@ -48565,7 +48591,7 @@ fSn fSn fSn fSn -uJq +swv wTu xhd rhh @@ -48614,7 +48640,7 @@ kPZ tHT xVI aiZ -rno +qfo wDw ubj uil @@ -48767,7 +48793,7 @@ fSn fSn fSn fSn -uJq +swv pKd xhd dYD @@ -48816,10 +48842,10 @@ waa qkm svL oIH -xve -wDw -ubj -uil +mTv +cYp +omP +knl mTv kxW csW @@ -48969,7 +48995,7 @@ fSn fSn fSn fSn -uJq +swv wTu fLY hIt @@ -49020,7 +49046,7 @@ ilL oIH goa hgw -ubj +hAs tLK day wEi @@ -49171,9 +49197,9 @@ fSn fSn fSn fSn -uJq -uJq -uJq +swv +swv +swv jbd gLY qGq @@ -49375,7 +49401,7 @@ fSn lHH lHH lHH -uJq +swv ood ygN spt @@ -49625,9 +49651,9 @@ waa ilL oIH vmS -mCa -rag -tLK +nOl +wYY +fRj fDs jrq etG @@ -49827,10 +49853,10 @@ reL okH oIH efo -wDw -ubj -uil -fRj +pvD +hAs +oqX +efo cbR onf wbX @@ -50028,7 +50054,7 @@ kPZ rII xVI aiZ -rno +qfo wDw ubj sUz @@ -50230,7 +50256,7 @@ waa jpw xVI iKe -xve +mTv wDw rag sUz @@ -50870,7 +50896,7 @@ pfD vfl hev kSw -nJt +nLq jXu pYH nLq @@ -51395,7 +51421,7 @@ fSn fSn fSn fSn -gkl +pTZ hgD sSM eHv @@ -51594,10 +51620,10 @@ fSn fSn fSn fSn -gkl -gkl -gkl -gkl +pTZ +pTZ +pTZ +pTZ pTZ cXV hau @@ -51795,8 +51821,8 @@ fSn fSn fSn fSn -gkl -gkl +pTZ +pTZ sGZ lAH lAH @@ -51997,7 +52023,7 @@ fSn fSn fSn fSn -gkl +pTZ ttt sSM cWZ @@ -52199,7 +52225,7 @@ fSn fSn fSn fSn -gkl +pTZ vZi kCO cWZ @@ -52401,8 +52427,8 @@ fSn fSn fSn fSn -gkl -gkl +pTZ +pTZ tJv vsR eIH @@ -52604,11 +52630,11 @@ fSn fSn fSn fSn -gkl +pTZ hcq mgm bdc -wCy +rSo rSo sXk rSo @@ -52806,11 +52832,11 @@ fSn fSn fSn fSn -gkl +pTZ feq rMt hsR -wCy +rSo ffB aaJ fph @@ -52818,7 +52844,7 @@ rSo feg jYU ebW -wCy +rSo fSn fSn wMt @@ -52844,8 +52870,8 @@ yet sij sij sij -yet -yet +rno +rno sij yet sij @@ -53008,11 +53034,11 @@ fSn fSn fSn fSn -gkl +pTZ bvZ ltw hsR -wCy +rSo jHO xgf neN @@ -53020,7 +53046,7 @@ rSo blg aXi bLo -wCy +rSo fSn fSn fSn @@ -53036,7 +53062,7 @@ geH geH geH ggO -iZJ +xve dDR sij sij @@ -53044,7 +53070,7 @@ xLV vux eCK sij -omP +pkF uTp xzx ccF @@ -53210,11 +53236,11 @@ fSn fSn fSn fSn -gkl +pTZ rWh vLU kjW -wCy +rSo lpX aXi coO @@ -53222,7 +53248,7 @@ rSo eWm xgf nqT -wCy +rSo fSn fSn fSn @@ -53412,11 +53438,11 @@ fSn fSn fSn fSn -gkl -gkl -gkl -gkl -wCy +pTZ +pTZ +pTZ +pTZ +rSo jHO yer edt @@ -53424,18 +53450,18 @@ rSo blg yer bLo -wCy +rSo fSn fSn fSn fSn fSn -imF +eUU jru aBd aBd vBZ -imF +eUU fSn fSn fSn @@ -53618,26 +53644,26 @@ fSn fSn fSn fSn -wCy -wCy -wCy -wCy -wCy -wCy -wCy -wCy -wCy +rSo +rSo +rSo +rSo +rSo +rSo +rSo +rSo +rSo fSn fSn fSn fSn fSn -imF +eUU vrI aBd fGx gCg -imF +eUU fSn fSn fSn @@ -53834,24 +53860,24 @@ fSn fSn fSn fSn -imF +eUU kEy aBd fGx fgi -imF +eUU fSn fSn -imF -imF -imF -imF -imF -imF -imF -imF -imF -imF +eUU +eUU +eUU +eUU +eUU +eUU +eUU +eUU +eUU +eUU fks dJw dJw @@ -54036,15 +54062,15 @@ imF imF imF imF -imF +eUU pkE iAG pYc jWd -imF -imF -imF -imF +eUU +eUU +eUU +eUU uSi ifp yhQ @@ -55052,9 +55078,9 @@ boI boI uhl nxh -imF -imF -imF +eUU +eUU +eUU iXw noE mFn @@ -55248,24 +55274,24 @@ fSn fSn fSn fSn -imF +eUU lza fGx aBd fYQ -imF +eUU fSn fSn -imF -imF -imF -imF -imF -imF -imF -imF -imF -imF +eUU +eUU +eUU +eUU +eUU +eUU +eUU +eUU +eUU +eUU lHH lHH dJw @@ -55450,12 +55476,12 @@ fSn fSn fSn fSn -imF +eUU kPR aBd aBd jqH -imF +eUU fSn fSn fSn @@ -55652,12 +55678,12 @@ fSn fSn fSn fSn -imF +eUU ybE aBd aBd fgi -imF +eUU fSn fSn fSn @@ -55854,12 +55880,12 @@ fSn fSn fSn fSn -imF +eUU ybE aBd aBd fYQ -imF +eUU fSn fSn fSn @@ -56056,12 +56082,12 @@ fSn fSn fSn fSn -imF +eUU afc aBd aBd fYQ -imF +eUU fSn fSn fSn @@ -56258,12 +56284,12 @@ fSn fSn fSn fSn -imF +eUU afc aBd aBd fgi -imF +eUU fSn fSn fSn @@ -56460,12 +56486,12 @@ fSn fSn fSn fSn -imF +eUU afc aBd fGx fgi -imF +eUU fSn fSn fSn @@ -56662,12 +56688,12 @@ fSn fSn fSn fSn -imF +eUU jcr aBd fGx gCg -imF +eUU fSn fSn lHH @@ -56864,12 +56890,12 @@ lHH fSn fSn fSn -imF +eUU afc aBd aBd fgi -imF +eUU fSn fSn lHH diff --git a/maps/whiskey_outpost_pve.json b/maps/whiskey_outpost_pve.json deleted file mode 100644 index d4988c10f0..0000000000 --- a/maps/whiskey_outpost_pve.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "map_name": "Whiskey Outpost - Blackstone Bridge", - "map_path": "map_files/Whiskey_Outpost_PvE", - "map_file": "Whiskey_Outpost_PvE.dmm", - "webmap_url": "WhiskeyOutpost", - "map_item_type": "/obj/item/map/whiskey_outpost_map", - "nightmare_path": "maps/Nightmare/maps/Whiskey_Outpost_PvE/", - "camouflage": "desert", - "gamemodes": [ - "Distress Signal: Lowpop" - ] -}