From 1ecde0bab47fe81bb9eb3b74453db937f21a88ff Mon Sep 17 00:00:00 2001 From: forwardslashN <150570209+FslashN@users.noreply.github.com> Date: Sat, 30 Mar 2024 15:40:16 -0500 Subject: [PATCH] Fixes From Test Makes sure ghosts spawn on ghost spawn and not late join, fixes some Outpost skillsets, other fixes for the game mode and the Blackstone map. Some added things, nothing major. --- code/datums/skills/civilian.dm | 12 +- code/datums/skills/uscm.dm | 6 +- .../colonialmarines/ai/remote_outpost.dm | 5 + code/game/objects/structures.dm | 4 +- .../structures/crates_lockers/closets.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 1 + .../closets/secure/marine_personal.dm | 4 + .../modules/cm_marines/equipment/kit_boxes.dm | 1 + code/modules/gear_presets/uscm_ground.dm | 4 +- code/modules/gear_presets/uscm_ship.dm | 2 +- code/modules/mob/new_player/new_player.dm | 31 +- .../Blackstone_Bridge/Blackstone_Bridge.dmm | 437 ++++++++++-------- 12 files changed, 299 insertions(+), 210 deletions(-) diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index bef1940e8f..e623068f32 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -17,7 +17,7 @@ CIVILIAN name = "Civilian Researcher" skills = list( SKILL_CQC = SKILL_UNSKILLED, - SKILL_MELEE = SKILL_UNSKILLED, + SKILL_MELEE_WEAPONS = SKILL_UNSKILLED, SKILL_FIREARMS = SKILL_UNSKILLED, SKILL_ENDURANCE = SKILL_UNSKILLED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, @@ -25,9 +25,9 @@ CIVILIAN SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_SURGERY = SKILL_MEDICAL_TRAINED, SKILL_CONSTRUCTION = SKILL_UNSKILLED,//workaround, don't want them to have any construction or engie or spec weapons. - SKILL_ENGINEERING = SKILL_UNSKILLED, + SKILL_ENGINEER = SKILL_UNSKILLED, SKILL_FIREMAN = SKILL_UNSKILLED, - SKILL_SPEC = SKILL_UNSKILLED, + SKILL_SPEC_WEAPONS = SKILL_UNSKILLED, SKILL_PILOT = SKILL_UNSKILLED, ) @@ -35,15 +35,15 @@ CIVILIAN name = "Civilian Linguist" skills = list( SKILL_CQC = SKILL_UNSKILLED, - SKILL_MELEE = SKILL_UNSKILLED, + SKILL_MELEE_WEAPONS = SKILL_UNSKILLED, SKILL_FIREARMS = SKILL_UNSKILLED, SKILL_ENDURANCE = SKILL_UNSKILLED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, SKILL_CONSTRUCTION = SKILL_UNSKILLED, - SKILL_ENGINEERING = SKILL_UNSKILLED, + SKILL_ENGINEER = SKILL_UNSKILLED, SKILL_FIREMAN = SKILL_UNSKILLED, - SKILL_SPEC = SKILL_UNSKILLED, + SKILL_SPEC_WEAPONS = SKILL_UNSKILLED, SKILL_PILOT = SKILL_UNSKILLED, ) diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 6a3bb2de8f..23ff0ee09e 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -353,7 +353,7 @@ COMMAND STAFF SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, //can change ship alt ) -/datum/skills/commander/uscm_ground +/datum/skills/oco name = "Commanding Officer (Outpost)" skills = list( SKILL_LEADERSHIP = SKILL_LEAD_MASTER,//Command @@ -363,7 +363,7 @@ COMMAND STAFF SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,//Combat - Some of the best combat skills around. But stuck in the CIC. SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_MELEE = SKILL_MELEE_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI,//Support @@ -397,7 +397,7 @@ COMMAND STAFF SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, ) -/datum/skills/XO/uscm_ground //Battlefield doctor/second in command. +/datum/skills/AO //Battlefield doctor/second in command. name = "Adjunct Officer (Outpost)" skills = list( SKILL_LEADERSHIP = SKILL_LEAD_MASTER,//Command diff --git a/code/game/gamemodes/colonialmarines/ai/remote_outpost.dm b/code/game/gamemodes/colonialmarines/ai/remote_outpost.dm index 3e268aa0b8..8363c7fa78 100644 --- a/code/game/gamemodes/colonialmarines/ai/remote_outpost.dm +++ b/code/game/gamemodes/colonialmarines/ai/remote_outpost.dm @@ -4,6 +4,7 @@ config_tag = GAMEMODE_REMOTE_OUTPOST votable = TRUE flags_round_type = MODE_GROUND_ONLY|MODE_NO_XENO_EVOLVE|MODE_NEW_SPAWN + toggleable_flags = MODE_NO_JOIN_AS_XENO|MODE_HARDCORE_PERMA taskbar_icon = 'icons/taskbar/gml_wo.png' @@ -36,6 +37,10 @@ if(!(I.z in SSmapping.levels_by_trait(ZTRAIT_GROUND))) qdel(I) //We don't want people to late-join somewhere they shouldn't. + for(var/obj/I in GLOB.observer_starts) + if(!(I.z in SSmapping.levels_by_trait(ZTRAIT_GROUND))) + qdel(I) //So ghosts spawn in near the action, but not strictly necessary. + . = ..() /datum/game_mode/remote_outpost/announce() diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index a845a245c0..beb6c58e47 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -144,8 +144,8 @@ 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. + Safety in case our layer doesn't reset in time. Not entirely safe, but with a short reset timer, it should be okay. 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. 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) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 86e902dbbb..20ffe435c1 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -123,7 +123,7 @@ update_icon() playsound(src.loc, close_sound, 15, 1) - density = TRUE + density = initial(density) //If they were not dense closed, they retain that. return TRUE /obj/structure/closet/proc/store_items(stored_units) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index c0db7f17b4..21e9ffdad8 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -158,6 +158,7 @@ req_one_access = null desc = "A secure storage unit for an outpost smartgunner." can_be_stacked = TRUE + density = FALSE /obj/structure/closet/secure_closet/smartgunner/uscm_ground/one/Initialize() . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm index e3cdbd1071..553f9827ea 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm @@ -90,6 +90,8 @@ new /obj/item/device/flash(src) new /obj/item/weapon/baton(src) new /obj/item/reagent_container/spray/pepper(src) + new /obj/item/clothing/suit/storage/marine/MP/CO(src) + new /obj/item/clothing/head/helmet/marine/CO(src) /obj/structure/closet/secure_closet/marine_personal/uscm_ground/lieutenant job = JOB_USCM_GROUND_AO @@ -99,6 +101,8 @@ new /obj/item/handcuffs new /obj/item/device/flash(src) new /obj/item/weapon/baton(src) + new /obj/item/clothing/suit/storage/marine/MP/SO(src) + new /obj/item/clothing/head/helmet/marine/MP/SO(src) /obj/structure/closet/secure_closet/marine_personal/uscm_ground/civilian job = JOB_USCM_GROUND_CIVILIAN diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index cee54cbcb2..6d62bcb57f 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -164,6 +164,7 @@ /obj/item/storage/box/spec/sapper/fill_preset_inventory() new /obj/item/defenses/handheld/sentry/custom(src) new /obj/item/ammo_magazine/sentry(src) + new /obj/item/ammo_magazine/sentry(src) new /obj/item/storage/pouch/general/large(src) new /obj/item/storage/pouch/construction(src) new /obj/item/stack/sheet/plasteel/med_large_stack(src) diff --git a/code/modules/gear_presets/uscm_ground.dm b/code/modules/gear_presets/uscm_ground.dm index ccdc1677fd..2ee3e3885e 100644 --- a/code/modules/gear_presets/uscm_ground.dm +++ b/code/modules/gear_presets/uscm_ground.dm @@ -35,7 +35,7 @@ paygrade = "MO3" role_comm_title = "OCO" minimum_age = 30 - skills = /datum/skills/XO + skills = /datum/skills/oco minimap_icon = list("cic" = MINIMAP_ICON_COLOR_COMMANDER) minimap_background = MINIMAP_ICON_BACKGROUND_CIC @@ -94,7 +94,7 @@ paygrade = "MO2" role_comm_title = "AO" minimum_age = 27 - skills = /datum/skills/auxiliary_officer + skills = /datum/skills/AO minimap_icon = list("cic" = MINIMAP_ICON_COLOR_HEAD) minimap_background = MINIMAP_ICON_BACKGROUND_CIC diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 7c9b147257..9c801bb357 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -657,7 +657,7 @@ paygrade = "MO2" role_comm_title = "ASO" minimum_age = 27 - skills = /datum/skills/auxiliary_officer + skills = /datum/skills/AO minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER) minimap_background = MINIMAP_ICON_BACKGROUND_CIC diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 3e98167488..e7e6e4e026 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -48,15 +48,15 @@ if(round_start) output += "

\[ [ready? "Ready":"Ready"] | [ready? "Not Ready":"Not Ready"] \]

" - output += "Be Xenomorph: [(client.prefs && (client.prefs.get_job_priority(JOB_XENOMORPH))) ? "Yes" : "No"]" + //output += "Be Xenomorph: [(client.prefs && (client.prefs.get_job_priority(JOB_XENOMORPH))) ? "Yes" : "No"]" else output += "View the Crew Manifest

" - output += "View Hive Leaders

" - output += "

Join the USCM!

" - output += "

Join the Hive!

" - if(SSticker.mode.flags_round_type & MODE_PREDATOR) - if(SSticker.mode.check_predator_late_join(src,0)) output += "

Join the Hunt!

" + //output += "View Hive Leaders

" + output += "

Join the action!

" + //output += "

Join the Hive!

" + //if(SSticker.mode.flags_round_type & MODE_PREDATOR) + // if(SSticker.mode.check_predator_late_join(src,0)) output += "

Join the Hunt!

" output += "

Observe

" @@ -115,24 +115,27 @@ if(!SSticker || SSticker.current_state == GAME_STATE_STARTUP) to_chat(src, SPAN_WARNING("The game is still setting up, please try again later.")) return - if(alert(src,"Are you sure you wish to observe? When you observe, you will not be able to join as marine. It might also take some time to become a xeno or responder!","Player Setup","Yes","No") == "Yes") + if(alert(src,"Are you sure you wish to observe? When you observe, you may not be able to play this round!","Player Setup","Yes","No") == "Yes") if(!client) return TRUE + var/obj/effect/landmark/observer_start/O = SAFEPICK(GLOB.observer_starts) + if(!istype(O)) + to_chat(src, SPAN_DANGER("Could not locate an observer spawn point. Contact a coder!")) + log_debug(SPAN_DEBUG("[src] tried spawning as an observer but could not locate an observer spawn point.")) + return FALSE + if(!client.prefs?.preview_dummy) client.prefs.update_preview_icon() - var/mob/dead/observer/observer = new /mob/dead/observer(get_turf(pick(GLOB.latejoin)), client.prefs.preview_dummy) + var/mob/dead/observer/observer = new /mob/dead/observer(get_turf(O), client.prefs.preview_dummy) observer.set_lighting_alpha_from_pref(client) spawning = TRUE observer.started_as_observer = TRUE close_spawn_windows() - var/obj/effect/landmark/observer_start/O = SAFEPICK(GLOB.observer_starts) - if(istype(O)) - to_chat(src, SPAN_NOTICE("Now teleporting.")) - observer.forceMove(O.loc) - else - to_chat(src, SPAN_DANGER("Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.")) + to_chat(src, SPAN_NOTICE("Now teleporting.")) + observer.forceMove(O.loc) + observer.icon = 'icons/mob/humans/species/r_human.dmi' observer.icon_state = "anglo_example" observer.alpha = 127 diff --git a/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm b/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm index 20b8650a2b..65d90cc1ed 100644 --- a/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm +++ b/maps/map_files/Blackstone_Bridge/Blackstone_Bridge.dmm @@ -109,7 +109,8 @@ icon_state = "1-2" }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "adn" = ( @@ -136,14 +137,22 @@ /area/whiskey_outpost/blackstone/inside/visitor_dormitory/room_one) "adM" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/lighter/zippo/gold{ - pixel_x = 6; - pixel_y = 5 - }, /obj/item/clipboard{ pixel_x = -5; pixel_y = 4 }, +/obj/structure/machinery/door_control{ + id = "Blackstone Captain Office"; + name = "toggle office shutters"; + pixel_x = 8; + pixel_y = -4; + access_modified = 1; + req_access_txt = "65" + }, +/obj/item/tool/lighter/zippo/gold{ + pixel_x = 5; + pixel_y = 8 + }, /turf/open/floor/wood, /area/whiskey_outpost/blackstone/inside/commander_office) "aeW" = ( @@ -679,7 +688,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkredfull2" + icon_state = "yellowfull" }, /area/whiskey_outpost/blackstone/inside/armory/weapons) "aBL" = ( @@ -1423,7 +1432,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "bhM" = ( @@ -2495,14 +2505,14 @@ access_modified = 1; name = "toggle outpost lockdown"; id = "Outpost Lockdown"; - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/device/binoculars/range/designator{ - pixel_y = 6; - pixel_x = 14 + pixel_x = -6; + pixel_y = 7 }, /obj/structure/surface/table/reinforced/black, +/obj/structure/machinery/recharger{ + pixel_y = 7; + pixel_x = 8 + }, /turf/open/floor/prison{ dir = 1; icon_state = "darkredfull2" @@ -2997,7 +3007,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "cFg" = ( @@ -3238,8 +3249,8 @@ pixel_y = 2 }, /obj/item/tool/extinguisher{ - pixel_x = -21; - pixel_y = 12 + pixel_x = -29; + pixel_y = 14 }, /turf/open/floor/carpet{ icon_state = "carpet6-0" @@ -4462,7 +4473,6 @@ /turf/open/floor/plating, /area/whiskey_outpost/blackstone/underground/maintenance/north_west) "dFl" = ( -/obj/structure/machinery/body_scanconsole, /obj/effect/decal/medical_decals{ icon_state = "docstripingdir" }, @@ -4472,9 +4482,9 @@ /obj/structure/cable/heavyduty{ icon_state = "0-2" }, +/obj/structure/machinery/sleep_console, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "dFG" = ( @@ -4577,9 +4587,8 @@ }, /area/whiskey_outpost/blackstone/outside/outpost/north) "dMG" = ( -/obj/structure/machinery/iv_drip, -/obj/structure/machinery/camera/autoname/uscm_ground{ - dir = 8 +/obj/structure/closet/secure_closet/surgical{ + pixel_x = 30 }, /turf/open/floor{ dir = 4; @@ -5552,6 +5561,10 @@ pixel_y = 4; pixel_x = -12 }, +/obj/structure/machinery/iv_drip, +/obj/structure/machinery/camera/autoname/uscm_ground{ + dir = 4 + }, /turf/open/floor{ dir = 8; icon_state = "whitegreen" @@ -5693,8 +5706,7 @@ icon_state = "triagedecalbottomleft" }, /turf/open/floor{ - dir = 6; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "eJi" = ( @@ -5899,15 +5911,9 @@ /turf/open/floor/carpet, /area/whiskey_outpost/blackstone/inside/visitor_dormitory/room_two) "ePR" = ( -/obj/structure/machinery/disposal, -/obj/item/storage/box/bodybags{ - pixel_x = 4; - pixel_y = 13 - }, -/obj/structure/disposalpipe/trunk, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor{ - dir = 5; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "eQo" = ( @@ -6035,9 +6041,6 @@ "eUK" = ( /turf/open/jungle/clear, /area/whiskey_outpost/blackstone/outside/jungle/north) -"eUU" = ( -/turf/closed/wall/r_wall, -/area/whiskey_outpost/blackstone/underground/mountain/tunnel) "eVa" = ( /obj/item/stack/rods, /turf/open/gm/dirt, @@ -6047,8 +6050,7 @@ /area/whiskey_outpost/blackstone/outside/jungle/perimeter_entrance/west) "eVx" = ( /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "eWi" = ( @@ -6505,7 +6507,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor{ - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "fqu" = ( @@ -7439,14 +7441,11 @@ }, /area/whiskey_outpost/blackstone/inside/pillbox/one) "gfj" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" - }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkredfull2" + dir = 4; + icon_state = "yellowcorner" }, -/area/whiskey_outpost/blackstone/inside/outpost_central) +/area/whiskey_outpost/blackstone/inside/armory/weapons) "gfF" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/folder/red, @@ -7536,6 +7535,13 @@ icon_state = "tile" }, /area/whiskey_outpost/blackstone/outside/boxing_ring) +"gkl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellowcorner" + }, +/area/whiskey_outpost/blackstone/inside/armory/weapons) "gky" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -8046,9 +8052,13 @@ }, /area/whiskey_outpost/blackstone/inside/outpost_central) "gLr" = ( -/obj/structure/extinguisher_cabinet, -/turf/open/gm/dirt, -/area/whiskey_outpost/blackstone/outside/perimeter_defense) +/obj/structure/window/framed/colony/reinforced, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + name = "office shutters"; + id = "Blackstone Captain Office" + }, +/turf/open/floor/plating, +/area/whiskey_outpost/blackstone/inside/commander_office) "gLY" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -9540,7 +9550,6 @@ }, /area/whiskey_outpost/blackstone/inside/warehouse) "icv" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/smartgunner/uscm_ground/one{ pixel_x = -8; pixel_y = 8 @@ -9551,7 +9560,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkredfull2" + icon_state = "redfull" }, /area/whiskey_outpost/blackstone/inside/armory/weapons) "icw" = ( @@ -10158,6 +10167,15 @@ icon_state = "whitegreencorner" }, /area/whiskey_outpost/blackstone/inside/medbay) +"iGR" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-4-8" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkredfull2" + }, +/area/whiskey_outpost/blackstone/inside/outpost_central) "iHu" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -10696,7 +10714,7 @@ /area/whiskey_outpost/blackstone/outside/jungle/north) "jhP" = ( /obj/structure/cable/heavyduty{ - icon_state = "2-8" + icon_state = "4-8" }, /turf/open/floor/prison{ dir = 1; @@ -10815,6 +10833,12 @@ /obj/item/tool/pickaxe, /turf/open/gm/dirt, /area/whiskey_outpost/blackstone/underground/western_caves/north) +"jnv" = ( +/turf/open/floor/prison{ + dir = 2; + icon_state = "redcorner" + }, +/area/whiskey_outpost/blackstone/inside/armory/weapons) "joi" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/classic{ @@ -10888,7 +10912,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "jpN" = ( @@ -12466,6 +12491,10 @@ "kAS" = ( /obj/structure/machinery/prop/almayer/CICmap, /obj/structure/surface/table/reinforced/prison, +/obj/item/device/binoculars/range/designator{ + pixel_y = 2; + pixel_x = -8 + }, /turf/open/floor/prison{ dir = 1; icon_state = "darkredfull2" @@ -13213,8 +13242,7 @@ phone_id = "Medbay" }, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "lhY" = ( @@ -13327,7 +13355,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "lnc" = ( @@ -14719,6 +14748,12 @@ /obj/structure/machinery/light/small{ dir = 1 }, +/obj/item/explosive/plastic/breaching_charge, +/obj/item/explosive/plastic/breaching_charge, +/obj/item/explosive/plastic, +/obj/item/explosive/plastic, +/obj/item/explosive/plastic, +/obj/item/explosive/plastic/breaching_charge, /turf/open/floor/prison{ dir = 10; icon_state = "floor_marked" @@ -14733,8 +14768,7 @@ pixel_y = 24 }, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "mwO" = ( @@ -15561,8 +15595,7 @@ dir = 1 }, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "niA" = ( @@ -16197,7 +16230,7 @@ /turf/open/asphalt, /area/whiskey_outpost/blackstone/outside/perimeter_defense) "nKc" = ( -/obj/structure/machinery/medical_pod/sleeper, +/obj/structure/machinery/medical_pod/bodyscanner, /turf/open/floor{ icon_state = "whitegreenfull" }, @@ -16886,22 +16919,16 @@ }, /area/whiskey_outpost/blackstone/outside/outpost/south) "orJ" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = 30 - }, -/obj/structure/bed/chair/wheelchair, -/obj/structure/bed/chair/wheelchair, -/obj/item/tool/extinguisher{ - pixel_x = 8; - pixel_y = 18 +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/machinery/disposal, +/obj/item/storage/box/bodybags{ + pixel_x = 4; + pixel_y = 13 }, /turf/open/floor{ - dir = 4; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "osn" = ( @@ -18203,12 +18230,12 @@ /turf/open/asphalt, /area/whiskey_outpost/blackstone/underground/mountain/tunnel) "puI" = ( -/obj/structure/bed/chair/wood/wings{ - dir = 4 - }, /obj/structure/cable/heavyduty{ icon_state = "4-8" }, +/obj/structure/bed/chair/wood/wings{ + dir = 1 + }, /obj/effect/landmark/start/captain/uscm_ground, /turf/open/floor/wood, /area/whiskey_outpost/blackstone/inside/commander_office) @@ -20052,7 +20079,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkredfull2" + icon_state = "yellowfull" }, /area/whiskey_outpost/blackstone/inside/armory/weapons) "rnk" = ( @@ -20578,6 +20605,10 @@ /area/whiskey_outpost/blackstone/outside/outpost_beach/mine) "rOk" = ( /obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard{ + pixel_x = -7; + pixel_y = 8 + }, /obj/item/storage/box/gloves{ pixel_x = 6; pixel_y = 9 @@ -20585,14 +20616,6 @@ /obj/item/storage/box/masks{ pixel_x = 6 }, -/obj/item/clipboard{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/device/taperecorder{ - pixel_x = -7; - pixel_y = 2 - }, /turf/open/floor{ dir = 10; icon_state = "whitegreen" @@ -20855,6 +20878,16 @@ icon_state = "tile" }, /area/whiskey_outpost/blackstone/outside/outpost_beach/west) +"sdv" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/bed/chair/wheelchair, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/whiskey_outpost/blackstone/outside/outpost/east) "sdZ" = ( /obj/structure/curtain, /turf/open/floor{ @@ -22302,6 +22335,10 @@ pixel_x = 7 }, /obj/structure/machinery/light, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_x = 7; + pixel_y = 10 + }, /turf/open/floor{ icon_state = "whitegreen" }, @@ -22342,8 +22379,7 @@ access_modified = 1 }, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "tnJ" = ( @@ -22606,7 +22642,7 @@ /area/whiskey_outpost/blackstone/outside/jungle/north/west) "tBe" = ( /obj/structure/cable/heavyduty{ - icon_state = "1-2" + icon_state = "1-2-8" }, /turf/open/floor/prison{ dir = 1; @@ -22641,7 +22677,7 @@ icon_state = "triagedecalbottomleft" }, /turf/open/floor{ - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "tBZ" = ( @@ -23432,6 +23468,11 @@ /area/whiskey_outpost/blackstone/outside/outpost_beach) "upZ" = ( /obj/structure/window/framed/colony/reinforced, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Blackstone Captain Office"; + name = "office shutters" + }, /turf/open/floor/plating, /area/whiskey_outpost/blackstone/inside/commander_office) "uqc" = ( @@ -23812,6 +23853,13 @@ icon_state = "darkredfull2" }, /area/whiskey_outpost/blackstone/inside/armory/weapons) +"uJq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/hydrant{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/whiskey_outpost/blackstone/underground/maintenance/engineering) "uJD" = ( /obj/structure/platform{ dir = 4 @@ -24300,8 +24348,7 @@ pixel_x = 14 }, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "vew" = ( @@ -24555,16 +24602,15 @@ }, /area/whiskey_outpost/blackstone/outside/outpost/south) "vnb" = ( +/obj/structure/machinery/light{ + dir = 1 + }, /obj/structure/machinery/autolathe/medilathe/full{ req_access_txt = "53"; access_modified = 1 }, -/obj/structure/machinery/light{ - dir = 1 - }, /turf/open/floor{ - dir = 1; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "vnp" = ( @@ -24630,7 +24676,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "vpW" = ( @@ -24706,7 +24753,7 @@ }, /obj/item/storage/box/cups{ pixel_x = -14; - pixel_y = 5 + pixel_y = 10 }, /obj/item/reagent_container/food/drinks/drinkingglass{ icon_state = "shotglass"; @@ -24731,6 +24778,15 @@ icon_state = "asteroidwarning" }, /area/whiskey_outpost/blackstone/inside/bunks) +"vtF" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/obj/structure/bed/chair/wheelchair, +/turf/open/floor{ + icon_state = "whitegreencorner" + }, +/area/whiskey_outpost/blackstone/inside/medbay) "vuq" = ( /turf/closed/wall, /area/whiskey_outpost/blackstone/underground/maintenance/south_west) @@ -25063,6 +25119,10 @@ /area/whiskey_outpost/blackstone/inside/medbay) "vKr" = ( /obj/structure/window/framed/colony/reinforced, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + name = "office shutters"; + id = "Blackstone Captain Office" + }, /obj/structure/machinery/door/poddoor/almayer/open{ id = "Outpost Lockdown"; name = "\improper Outpost Lockdown" @@ -25164,11 +25224,14 @@ /area/whiskey_outpost/blackstone/inside/warehouse) "vNN" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger, /obj/item/reagent_container/hypospray{ pixel_x = -9; pixel_y = 4 }, +/obj/item/device/taperecorder{ + pixel_x = 5; + pixel_y = 1 + }, /turf/open/floor{ dir = 6; icon_state = "whitegreen" @@ -25702,6 +25765,12 @@ /obj/structure/disposalpipe/segment, /turf/open/gm/dirt, /area/whiskey_outpost/blackstone/outside/perimeter_defense) +"wlQ" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "redcorner" + }, +/area/whiskey_outpost/blackstone/inside/armory/weapons) "wmd" = ( /obj/effect/decal/sand_overlay/sand5{ dir = 1 @@ -25726,12 +25795,10 @@ /area/whiskey_outpost/blackstone/outside/outpost/south) "wmz" = ( /obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger, /obj/item/device/mass_spectrometer{ - pixel_x = -4 - }, -/obj/item/reagent_container/glass/beaker/bluespace{ - pixel_x = 7; - pixel_y = 1 + pixel_x = -4; + pixel_y = 5 }, /turf/open/floor{ dir = 9; @@ -26197,6 +26264,9 @@ /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, +/area/whiskey_outpost/blackstone/underground/mountain/tunnel) "wCG" = ( /obj/effect/decal/cleanable/blood/oil{ icon_state = "csplatter1" @@ -27045,8 +27115,7 @@ dir = 4 }, /turf/open/floor{ - dir = 4; - icon_state = "whitegreen" + icon_state = "whitegreenfull" }, /area/whiskey_outpost/blackstone/inside/medbay) "xjI" = ( @@ -27294,7 +27363,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "white" + dir = 1; + icon_state = "whitegreen" }, /area/whiskey_outpost/blackstone/inside/medbay) "xuF" = ( @@ -27369,6 +27439,15 @@ /obj/structure/sign/prop1, /turf/closed/wall, /area/whiskey_outpost/blackstone/outside/jungle/north) +"xyh" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-4-8" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkredfull2" + }, +/area/whiskey_outpost/blackstone/inside/outpost_central) "xzb" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -28069,9 +28148,6 @@ /obj/structure/cable/heavyduty{ icon_state = "0-4" }, -/obj/structure/closet/hydrant{ - pixel_x = -32 - }, /obj/structure/machinery/camera/autoname/uscm_ground{ dir = 4 }, @@ -28220,7 +28296,6 @@ /turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/blackstone/outside/jungle/north) "yfA" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/squad_sergeant/uscm_ground/one{ pixel_y = -2; pixel_x = -8 @@ -28231,7 +28306,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkredfull2" + icon_state = "redfull" }, /area/whiskey_outpost/blackstone/inside/armory/weapons) "yfU" = ( @@ -39904,7 +39979,7 @@ lUo lUo lUo uqL -nBu +uJq ulj nBu nGB @@ -46979,8 +47054,8 @@ fSn fSn jAV aBJ -agL -qlE +gfj +gkl rnh jAV fAt @@ -47181,8 +47256,8 @@ fSn fSn jAV icv -agL -buq +wlQ +jnv yfA jAV vek @@ -48020,7 +48095,7 @@ mEp vSf efc oiB -upZ +gLr hog sFf tlt @@ -48222,7 +48297,7 @@ nVy vSf fHU oiB -upZ +gLr rWj hZR lVZ @@ -49228,12 +49303,12 @@ uWy uWy sRl jhP +rfJ +rfJ +iGR dos dos mot -dos -deg -mot deg dos dos @@ -49432,9 +49507,9 @@ bZG tBe dos dos -deg -dos -gfj +xyh +rfJ +rfJ rfJ eJw rfJ @@ -52059,7 +52134,7 @@ hOD eVx cEF xDS -iGM +vtF eYj dMG vNN @@ -52663,7 +52738,7 @@ yet osO wnG wnG -wnG +sdv wnG wnG wnG @@ -53139,7 +53214,7 @@ bsL bsL bsL ivm -gLr +kpx rzA bqL agt @@ -53456,12 +53531,12 @@ fSn fSn fSn fSn -eUU +wCy jru aBd aBd vBZ -eUU +wCy fSn fSn fSn @@ -53658,12 +53733,12 @@ fSn fSn fSn fSn -eUU +wCy vrI aBd fGx gCg -eUU +wCy fSn fSn fSn @@ -53860,24 +53935,24 @@ fSn fSn fSn fSn -eUU +wCy kEy aBd fGx fgi -eUU -fSn -fSn -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU +wCy +fSn +fSn +wCy +wCy +wCy +wCy +wCy +wCy +wCy +wCy +wCy +wCy fks dJw dJw @@ -54062,15 +54137,15 @@ imF imF imF imF -eUU +wCy pkE iAG pYc jWd -eUU -eUU -eUU -eUU +wCy +wCy +wCy +wCy uSi ifp yhQ @@ -55078,9 +55153,9 @@ boI boI uhl nxh -eUU -eUU -eUU +wCy +wCy +wCy iXw noE mFn @@ -55274,24 +55349,24 @@ fSn fSn fSn fSn -eUU +wCy lza fGx aBd fYQ -eUU +wCy fSn fSn -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU -eUU +wCy +wCy +wCy +wCy +wCy +wCy +wCy +wCy +wCy +wCy lHH lHH dJw @@ -55476,12 +55551,12 @@ fSn fSn fSn fSn -eUU +wCy kPR aBd aBd jqH -eUU +wCy fSn fSn fSn @@ -55678,12 +55753,12 @@ fSn fSn fSn fSn -eUU +wCy ybE aBd aBd fgi -eUU +wCy fSn fSn fSn @@ -55880,12 +55955,12 @@ fSn fSn fSn fSn -eUU +wCy ybE aBd aBd fYQ -eUU +wCy fSn fSn fSn @@ -56082,12 +56157,12 @@ fSn fSn fSn fSn -eUU +wCy afc aBd aBd fYQ -eUU +wCy fSn fSn fSn @@ -56284,12 +56359,12 @@ fSn fSn fSn fSn -eUU +wCy afc aBd aBd fgi -eUU +wCy fSn fSn fSn @@ -56486,12 +56561,12 @@ fSn fSn fSn fSn -eUU +wCy afc aBd fGx fgi -eUU +wCy fSn fSn fSn @@ -56688,12 +56763,12 @@ fSn fSn fSn fSn -eUU +wCy jcr aBd fGx gCg -eUU +wCy fSn fSn lHH @@ -56890,12 +56965,12 @@ lHH fSn fSn fSn -eUU +wCy afc aBd aBd fgi -eUU +wCy fSn fSn lHH