diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm index f50d7d8e2c72..b13adf43e8cd 100644 --- a/code/__DEFINES/camera.dm +++ b/code/__DEFINES/camera.dm @@ -3,6 +3,7 @@ #define CAMERA_NET_CONTAINMENT "Containment" #define CAMERA_NET_CONTAINMENT_HIDDEN "Containment Hidden" #define CAMERA_NET_RESEARCH "Research" +#define CAMERA_NET_BRIG "Brig" #define CAMERA_NET_ALAMO "Alamo" #define CAMERA_NET_NORMANDY "Normandy" #define CAMERA_NET_COLONY "Colony" diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index e2c89df90e9b..17464b44dae8 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "7.1.2" +#define TGS_DMAPI_VERSION "7.1.3" // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/code/controllers/subsystem/init/lobby_art.dm b/code/controllers/subsystem/init/lobby_art.dm index 7c49d5fe1787..4b26d576b8df 100644 --- a/code/controllers/subsystem/init/lobby_art.dm +++ b/code/controllers/subsystem/init/lobby_art.dm @@ -6,5 +6,5 @@ SUBSYSTEM_DEF(lobby_art) /datum/controller/subsystem/lobby_art/Initialize() var/list/lobby_arts = CONFIG_GET(str_list/lobby_art_images) if(length(lobby_arts)) - force_lobby_art(rand(1,length(lobby_arts))) + force_lobby_art(rand(1, length(lobby_arts))) return SS_INIT_SUCCESS diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index e0daaee74a8c..d93b07234c9d 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -126,6 +126,14 @@ to_chat(user, SPAN_WARNING("You can't do this right now.")) return FALSE + if (user.is_mob_incapacitated()) + to_chat(user, SPAN_WARNING("You can't do this right now.")) + return FALSE + + if (HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) + to_chat(user, SPAN_WARNING("You can't do this right now.")) + return FALSE + if ((item.flags_inventory & CANTSTRIP) || ((item.flags_item & NODROP) && !(item.flags_item & FORCEDROP_CONDITIONAL)) || (item.flags_item & ITEM_ABSTRACT)) return FALSE diff --git a/code/datums/quadtree.dm b/code/datums/quadtree.dm index 200a51b358a0..9056dfd6bd59 100644 --- a/code/datums/quadtree.dm +++ b/code/datums/quadtree.dm @@ -82,7 +82,7 @@ /// Returns TRUE if this shape's bounding box intersects the provided shape's bounding box, otherwise FALSE. Generally faster than a full intersection test. /datum/shape/proc/intersects_aabb(datum/shape/aabb) - return (abs(src.center_x - aabb.center_x) <= (src.bounds_x + aabb.bounds_x) * 0.5) && (abs(src.center_y - aabb.center_y) <= (src.bounds_x + aabb.bounds_x) * 0.5) + return (abs(src.center_x - aabb.center_x) <= (src.bounds_x + aabb.bounds_x) * 0.5) && (abs(src.center_y - aabb.center_y) <= (src.bounds_y + aabb.bounds_y) * 0.5) /// Returns TRUE if this shape intersects the provided rectangle shape, otherwise FALSE. /datum/shape/proc/intersects_rect(datum/shape/rectangle/rect) diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index a1d7f00cf94a..f8ce33eb9911 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -99,6 +99,10 @@ name = "ares core camera" network = list(CAMERA_NET_ARES) +/obj/structure/machinery/camera/autoname/almayer/brig + name = "brig camera" + network = list(CAMERA_NET_BRIG) + //used by the landing camera dropship equipment. Do not place them right under where the dropship lands. //Should place them near each corner of your LZs. /obj/structure/machinery/camera/autoname/lz_camera diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index 24f5d2f0a273..40fdeabb8d13 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -358,6 +358,10 @@ /obj/structure/machinery/computer/cameras/almayer_network/vehicle network = list(CAMERA_NET_ALMAYER, CAMERA_NET_VEHICLE) +/obj/structure/machinery/computer/cameras/almayer_brig + name = "Brig Cameras Console" + network = list(CAMERA_NET_BRIG) + /obj/structure/machinery/computer/cameras/mortar name = "Mortar Camera Interface" alpha = 0 diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index c43d7e730d89..7157a56aa7f9 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -451,7 +451,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list( list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Officer Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY), list("Auxiliary Support Officer Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service/aso, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("BAG (CHOOSE 1)", 0, null, null, null), @@ -463,6 +462,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list( list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), list("M44 Custom Revolver", 0, /obj/item/storage/belt/gun/m44/custom, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("HAT (CHOOSE 1)", 0, null, null, null), + list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), + list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), + list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), + list("Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), + list("Service Peaked Cap", 0, /obj/item/clothing/head/marine/peaked/service, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED), + list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm deleted file mode 100644 index 564b3e41f591..000000000000 --- a/code/game/objects/items/devices/suit_cooling.dm +++ /dev/null @@ -1,179 +0,0 @@ -/obj/item/device/suit_cooling_unit - name = "portable suit cooling unit" - desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling." - w_class = SIZE_LARGE - icon_state = "suitcooler0" - flags_equip_slot = SLOT_BACK //you can carry it on your back if you want, but it won't do anything unless attached to suit storage - - //copied from tank.dm - flags_atom = FPRINT|CONDUCT - force = 5 - throwforce = 10 - throw_speed = SPEED_FAST - throw_range = 4 - - - - var/on = 0 //is it turned on? - var/cover_open = 0 //is the cover open? - var/obj/item/cell/cell - var/max_cooling = 12 //in degrees per second - probably don't need to mess with heat capacity here - var/charge_consumption = 16.6 //charge per second at max_cooling - var/thermostat = T20C - - //TODO: make it heat up the surroundings when not in space - -/obj/item/device/suit_cooling_unit/Initialize(mapload, ...) - . = ..() - - START_PROCESSING(SSobj, src) - - cell = new/obj/item/cell(src) //comes with the crappy default power cell - high-capacity ones shouldn't be hard to find - -/obj/item/device/suit_cooling_unit/Destroy() - STOP_PROCESSING(SSobj, src) - return ..() - -/obj/item/device/suit_cooling_unit/process() - if (!on || !cell) - return - - if (!ismob(loc)) - return - - if (!attached_to_suit(loc)) //make sure they have a suit and we are attached to it - return - - var/mob/living/carbon/human/H = loc - - var/efficiency = 1 - H.get_pressure_weakness() //you need to have a good seal for effective cooling - var/env_temp = get_environment_temperature() //wont save you from a fire - var/temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling) - - if (temp_adj < 0.5) //only cools, doesn't heat, also we don't need extreme precision - return - - var/charge_usage = (temp_adj/max_cooling)*charge_consumption - - H.bodytemperature -= temp_adj*efficiency - H.recalculate_move_delay = TRUE - - cell.use(charge_usage) - - if(cell.charge <= 0) - turn_off() - -/obj/item/device/suit_cooling_unit/proc/get_environment_temperature() - if (ishuman(loc)) - var/mob/living/carbon/human/H = loc - return H.return_temperature() - - var/turf/T = get_turf(src) - return T.return_temperature() - -/obj/item/device/suit_cooling_unit/proc/attached_to_suit(mob/M) - if (!ishuman(M)) - return 0 - - var/mob/living/carbon/human/H = M - - if (!H.wear_suit || H.s_store != src) - return 0 - - return 1 - -/obj/item/device/suit_cooling_unit/proc/turn_on() - if(!cell) - return - if(cell.charge <= 0) - return - - on = 1 - updateicon() - -/obj/item/device/suit_cooling_unit/proc/turn_off() - if (ismob(src.loc)) - var/mob/M = src.loc - M.show_message("\The [src] clicks and whines as it powers down.", SHOW_MESSAGE_AUDIBLE) //let them know in case it's run out of power. - on = 0 - updateicon() - -/obj/item/device/suit_cooling_unit/attack_self(mob/user) - ..() - - if(cover_open && cell) - if(ishuman(user)) - user.put_in_hands(cell) - else - cell.forceMove(get_turf(loc)) - - cell.add_fingerprint(user) - cell.update_icon() - - to_chat(user, "You remove [cell].") - src.cell = null - updateicon() - return - - //TODO use a UI like the air tanks - if(on) - turn_off() - else - turn_on() - if (on) - to_chat(user, "You switch on [src].") - -/obj/item/device/suit_cooling_unit/attackby(obj/item/W as obj, mob/user as mob) - if (HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) - if(cover_open) - cover_open = 0 - to_chat(user, "You screw the panel into place.") - else - cover_open = 1 - to_chat(user, "You unscrew the panel.") - updateicon() - return - - if (istype(W, /obj/item/cell)) - if(cover_open) - if(cell) - to_chat(user, "There is \a [cell] already installed here.") - else - if(user.drop_held_item()) - W.forceMove(src) - cell = W - to_chat(user, "You insert [cell].") - updateicon() - return - - return ..() - -/obj/item/device/suit_cooling_unit/proc/updateicon() - if (cover_open) - if (cell) - icon_state = "suitcooler1" - else - icon_state = "suitcooler2" - else - icon_state = "suitcooler0" - -/obj/item/device/suit_cooling_unit/get_examine_text(mob/user) - . = ..() - if (on) - if (attached_to_suit(src.loc)) - . += "It's switched on and running." - else - . += "It's switched on, but not attached to anything." - else - . += "It is switched off." - - if (cover_open) - if(cell) - . += "The panel is open, exposing [cell]." - else - . += "The panel is open." - - if (cell) - . += "The charge meter reads [floor(cell.percent())]%." - else - . += "It doesn't have a power cell installed." diff --git a/code/game/objects/items/tools/cleaning_tools.dm b/code/game/objects/items/tools/cleaning_tools.dm index f392f096bcf6..fba21de3328d 100644 --- a/code/game/objects/items/tools/cleaning_tools.dm +++ b/code/game/objects/items/tools/cleaning_tools.dm @@ -99,13 +99,15 @@ desc = "This cone is trying to warn you of something!" icon_state = "cone" icon = 'icons/obj/janitor.dmi' + item_icons = 'icons/mob/humans/onmob/head_0.dmi' force = 1 throwforce = 3 throw_speed = SPEED_FAST throw_range = 5 w_class = SIZE_SMALL attack_verb = list("warned", "cautioned", "smashed") - + flags_equip_slot = SLOT_HEAD + flags_inv_hide = HIDEEARS|HIDETOPHAIR diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 21839d35af03..6db61002c2fe 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -297,11 +297,10 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /turf/closed/wall/indestructible/splashscreen name = "Lobby Art" desc = "Assorted artworks." - icon = 'icons/lobby/title.dmi' - icon_state = "" -// icon_state = "title_holiday" + icon = 'icons/lobby/title_loading.dmi' + icon_state = "title" layer = FLY_LAYER - special_icon = 1 + special_icon = TRUE /turf/closed/wall/indestructible/splashscreen/Initialize() . = ..() @@ -309,16 +308,19 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /proc/force_lobby_art(art_id) GLOB.displayed_lobby_art = art_id - var/turf/closed/wall/indestructible/splashscreen/SS = locate("LOBBYART") + var/turf/closed/wall/indestructible/splashscreen/lobby_art = locate("LOBBYART") var/list/lobby_arts = CONFIG_GET(str_list/lobby_art_images) var/list/lobby_authors = CONFIG_GET(str_list/lobby_art_authors) - SS.icon_state = lobby_arts[GLOB.displayed_lobby_art] - SS.desc = "Artwork by [lobby_authors[GLOB.displayed_lobby_art]]" - for(var/client/C in GLOB.clients) + lobby_art.icon = 'icons/lobby/title.dmi' + lobby_art.icon_state = lobby_arts[GLOB.displayed_lobby_art] + lobby_art.desc = "Artwork by [lobby_authors[GLOB.displayed_lobby_art]]" + lobby_art.pixel_x = -288 + lobby_art.pixel_y = -288 + for(var/client/player in GLOB.clients) if(GLOB.displayed_lobby_art != -1) var/author = lobby_authors[GLOB.displayed_lobby_art] if(author != "Unknown") - to_chat_forced(C, SPAN_ROUNDBODY("
This round's lobby art is brought to you by [author]
")) + to_chat_forced(player, SPAN_ROUNDBODY("
This round's lobby art is brought to you by [author]
")) /turf/closed/wall/indestructible/other icon_state = "r_wall" diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 9c28ca42bc41..a8b056d0bb9d 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -32,7 +32,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen) slowdown = 3 armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE diff --git a/code/modules/mob/living/carbon/human/life/life_helpers.dm b/code/modules/mob/living/carbon/human/life/life_helpers.dm index cab3ae21a782..9388204a967d 100644 --- a/code/modules/mob/living/carbon/human/life/life_helpers.dm +++ b/code/modules/mob/living/carbon/human/life/life_helpers.dm @@ -6,25 +6,6 @@ * Mostly for procs that are not called in the direct Life() loop, except for exact functionality matches (handle_breath, breathe, get_breath_from_internal for example) */ -//Calculate how vulnerable the human is to under- and overpressure. -//Returns 0 (equals 0 %) if sealed in an undamaged suit, 1 if unprotected (equals 100%). -//Suitdamage can modifiy this in 10% steps. -/mob/living/carbon/human/proc/get_pressure_weakness() - - var/pressure_adjustment_coefficient = 1 // Assume no protection at first. - - if(wear_suit && (wear_suit.flags_inventory & NOPRESSUREDMAGE) && head && (head.flags_inventory & NOPRESSUREDMAGE)) //Complete set of pressure-proof suit worn, assume fully sealed. - pressure_adjustment_coefficient = 0 - - //Handles breaches in your space suit. 10 suit damage equals a 100% loss of pressure protection. - if(istype(wear_suit, /obj/item/clothing/suit/space)) - var/obj/item/clothing/suit/space/S = wear_suit - if(S.can_breach && S.damage) - pressure_adjustment_coefficient += S.damage * 0.1 - - pressure_adjustment_coefficient = min(1, max(pressure_adjustment_coefficient, 0)) //So it isn't less than 0 or larger than 1. - return pressure_adjustment_coefficient - /mob/living/carbon/human/proc/stabilize_body_temperature() diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index f2d5c50f7391..ab5a8d462713 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -8,7 +8,7 @@ unarmed_type = /datum/unarmed_attack/punch/synthetic pain_type = /datum/pain/synthetic stamina_type = /datum/stamina/none - mob_inherent_traits = list(TRAIT_SUPER_STRONG) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_IRON_TEETH) rarity_value = 2 insulated = TRUE @@ -64,7 +64,7 @@ name = SYNTH_GEN_ONE uses_skin_color = FALSE special_body_types = FALSE - mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_IRON_TEETH) hair_color = "#000000" icobase = 'icons/mob/humans/species/r_synthetic.dmi' @@ -81,7 +81,7 @@ uses_skin_color = TRUE special_body_types = TRUE burn_mod = 0.8 - mob_inherent_traits = list(TRAIT_SUPER_STRONG) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_IRON_TEETH) pain_type = /datum/pain/synthetic/colonial rarity_value = 1.5 @@ -103,7 +103,7 @@ name = SYNTH_COLONY_GEN_ONE uses_skin_color = FALSE special_body_types = FALSE - mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_IRON_TEETH) //sets colonial_gen_one synth's hair to black hair_color = "#000000" //sets colonial_gen_one synth's icon to WJ sprite @@ -116,7 +116,7 @@ name_plural = "Combat Synthetics" uses_skin_color = FALSE special_body_types = FALSE - mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_IRON_TEETH) burn_mod = 0.6 //made for combat total_health = 250 //made for combat @@ -137,7 +137,7 @@ name = SYNTH_INFILTRATOR name_plural = "Infiltrator Synthetics" uses_skin_color = TRUE - mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INFILTRATOR_SYNTH) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INFILTRATOR_SYNTH, TRAIT_IRON_TEETH) bloodsplatter_type = /obj/effect/temp_visual/dir_setting/bloodsplatter/human diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm index f2c0e8d4cf26..0273fe6b903f 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm @@ -4,7 +4,7 @@ death_message = "violently gargles fluid and seizes up, the glow in their eyes dimming..." uses_skin_color = FALSE burn_mod = 0.65 // made for hazardous environments, withstanding temperatures up to 1210 degrees - mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT, TRAIT_CANNOT_EAT, TRAIT_UNSTRIPPABLE) + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT, TRAIT_CANNOT_EAT, TRAIT_UNSTRIPPABLE, TRAIT_IRON_TEETH) slowdown = 0.45 hair_color = "#000000" diff --git a/code/modules/mob/living/carbon/human/species/yautja/_species.dm b/code/modules/mob/living/carbon/human/species/yautja/_species.dm index 86653af92b4b..042c9917af61 100644 --- a/code/modules/mob/living/carbon/human/species/yautja/_species.dm +++ b/code/modules/mob/living/carbon/human/species/yautja/_species.dm @@ -14,6 +14,7 @@ TRAIT_FOREIGN_BIO, TRAIT_DEXTROUS, TRAIT_EMOTE_CD_EXEMPT, + TRAIT_IRON_TEETH, ) unarmed_type = /datum/unarmed_attack/punch/strong secondary_unarmed_type = /datum/unarmed_attack/bite/strong diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index 82b9291dc555..ebf58133308f 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -137,25 +137,31 @@ /mob/living/carbon/xenomorph/gib(datum/cause_data/cause = create_cause_data("gibbing", src)) var/obj/effect/decal/remains/xeno/remains = new(get_turf(src)) - remains.icon = icon + var/icon_path + var/gib_state = "gibbed-a-corpse" remains.pixel_x = pixel_x //For 2x2. if(!caste) CRASH("CASTE ERROR: gib() was called without a caste. (name: [name], disposed: [QDELETED(src)], health: [health])") - switch(caste.caste_type) //This will need to be changed later, when we have proper xeno pathing. Might do it on caste or something. + if(mob_size >= MOB_SIZE_BIG) + icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi' + else + icon_path = 'icons/mob/xenos/xenomorph_48x48.dmi' + switch(caste.caste_type) + if(XENO_CASTE_RUNNER) + icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi' + gib_state = "gibbed-a-corpse-runner" if(XENO_CASTE_BOILER) var/mob/living/carbon/xenomorph/boiler/src_boiler = src visible_message(SPAN_DANGER("[src] begins to bulge grotesquely, and explodes in a cloud of corrosive gas!")) src_boiler.smoke.set_up(2, 0, get_turf(src), new_cause_data = src_boiler.smoke.cause_data) src_boiler.smoke.start() - remains.icon_state = "gibbed-a-corpse" - if(XENO_CASTE_RUNNER) - remains.icon_state = "gibbed-a-corpse-runner" if(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA) - remains.icon_state = "larva_gib_corpse" - else - remains.icon_state = "gibbed-a-corpse" + icon_path = 'icons/mob/xenos/larva.dmi' + + remains.icon_state = gib_state + remains.icon = icon_path check_blood_splash(35, BURN, 65, 2) //Some testing numbers. 35 burn, 65 chance. @@ -170,8 +176,12 @@ icon_path = 'icons/mob/xenos/xenomorph_48x48.dmi' switch(caste.caste_type) if(XENO_CASTE_RUNNER) + icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi' to_flick = "gibbed-a-runner" + if(XENO_CASTE_BOILER) + to_flick = "gibbed-a-boiler" if(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA) + icon_path = 'icons/mob/xenos/larva.dmi' to_flick = "larva_gib" new /obj/effect/overlay/temp/gib_animation/xeno(loc, src, to_flick, icon_path) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index a8ca94ba0aa5..5f17c9a73285 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -368,6 +368,10 @@ unacidable = TRUE ///If true, the lifeboat is in the process of launching, and so the code will not allow another launch. var/launch_initiated = FALSE + ///If true, the lifeboat is in the process of having the xeno override removed by the pilot. + var/override_being_removed = FALSE + ///How long it takes to unlock the console + var/remaining_time = 180 SECONDS /obj/structure/machinery/computer/shuttle/lifeboat/ex_act(severity) return @@ -376,7 +380,31 @@ . = ..() var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = SSshuttle.getShuttle(shuttleId) if(lifeboat.status == LIFEBOAT_LOCKED) - to_chat(user, SPAN_WARNING("[src] flickers with error messages.")) + if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)) + to_chat(user, SPAN_WARNING("[src] displays an error message and asks you to contact your pilot to resolve the problem.")) + return + if(user.action_busy || override_being_removed) + return + to_chat(user, SPAN_NOTICE("You start to remove the lockout.")) + override_being_removed = TRUE + user.visible_message(SPAN_NOTICE("[user] starts to type on [src]."), + SPAN_NOTICE("You try to take back control over the lifeboat. It will take around [remaining_time / 10] seconds.")) + while(remaining_time > 20 SECONDS) + if(!do_after(user, 20 SECONDS, INTERRUPT_ALL|INTERRUPT_CHANGED_LYING, BUSY_ICON_HOSTILE, numticks = 20)) + to_chat(user, SPAN_WARNING("You fail to remove the lockout!")) + override_being_removed = FALSE + return + remaining_time = remaining_time - 20 SECONDS + if(remaining_time > 0) + to_chat(user, SPAN_NOTICE("You partially bypass the lockout, only [remaining_time / 10] seconds left.")) + to_chat(user, SPAN_NOTICE("You successfully removed the lockout!")) + playsound(loc, 'sound/machines/terminal_success.ogg', KEYBOARD_SOUND_VOLUME, 1) + lifeboat.status = LIFEBOAT_ACTIVE + lifeboat.available = TRUE + user.visible_message(SPAN_NOTICE("[src] blinks with blue lights."), + SPAN_NOTICE("You have successfully taken back control over the lifeboat.")) + override_being_removed = FALSE + return else if(lifeboat.status == LIFEBOAT_INACTIVE) to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting evacuation order\".")) else if(lifeboat.status == LIFEBOAT_ACTIVE) @@ -456,6 +484,8 @@ var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock = lifeboat.get_docked() lifeboat_dock.open_dock() xeno_message(SPAN_XENOANNOUNCE("We have wrested away control of one of the metal birds! They shall not escape!"), 3, xeno.hivenumber) + launch_initiated = FALSE + remaining_time = initial(remaining_time) return XENO_NO_DELAY_ACTION else return ..() diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md index 6319028d8106..35ca73d7e9a8 100644 --- a/code/modules/tgs/README.md +++ b/code/modules/tgs/README.md @@ -1,6 +1,6 @@ # DMAPI Internals -This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. +This folder should be placed on its own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. - [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest. - The [core](./core) folder includes all code not directly part of any API version. diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 95b8edd3ee5c..05d0dee25b3c 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -50,7 +50,9 @@ version = null // we want this to be the TGS version, not the interop version // sleep once to prevent an issue where world.Export on the first tick can hang indefinitely + TGS_DEBUG_LOG("Starting Export bug prevention sleep tick. time:[world.time] sleep_offline:[world.sleep_offline]") sleep(world.tick_lag) + TGS_DEBUG_LOG("Export bug prevention sleep complete") var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort())) if(!istype(bridge_response)) diff --git a/colonialmarines.dme b/colonialmarines.dme index 7915adce0587..54760dde8594 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1140,7 +1140,6 @@ #include "code\game\objects\items\devices\pipe_painter.dm" #include "code\game\objects\items\devices\portable_vendor.dm" #include "code\game\objects\items\devices\scanners.dm" -#include "code\game\objects\items\devices\suit_cooling.dm" #include "code\game\objects\items\devices\taperecorder.dm" #include "code\game\objects\items\devices\teleportation.dm" #include "code\game\objects\items\devices\transfer_valve.dm" diff --git a/html/changelogs/AutoChangeLog-pr-6661.yml b/html/changelogs/AutoChangeLog-pr-6661.yml new file mode 100644 index 000000000000..a4663ee888d2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6661.yml @@ -0,0 +1,4 @@ +author: "zzzmike" +delete-after: True +changes: + - rscadd: "pilots can unhack lifeboats, similar to dropship unhacking" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6762.yml b/html/changelogs/AutoChangeLog-pr-6762.yml new file mode 100644 index 000000000000..af02078356e6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6762.yml @@ -0,0 +1,6 @@ +author: "efzapa" +delete-after: True +changes: + - rscadd: "All Brig Detainment Cameras are now linked to a new Brig Camera Console Computer, available in the Brig Lobby, Warden's Office, CIC, and CMP Office." + - maptweak: "Removed one of the Security Records Consoles in the Brig Lobby in place for a Brig Camera Console." + - mapadd: "Both Brig Perma Cells now have brig cameras in them." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6810.yml b/html/changelogs/AutoChangeLog-pr-6810.yml new file mode 100644 index 000000000000..b1daf0b6d8b9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6810.yml @@ -0,0 +1,4 @@ +author: "zzzmike" +delete-after: True +changes: + - bugfix: "stops attempted stripping when stunned etc." \ No newline at end of file diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 32e6ff4372d9..3a08f35ded14 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -222,3 +222,32 @@ 2024-07-23: cuberound: - code_imp: cleans up water particle code +2024-07-24: + Doubleumc: + - bugfix: sounds & motion detectors should be more reliable +2024-07-25: + cuberound: + - rscdel: removes /obj/item/device/suit_cooling_unit and get_pressure_weakness() +2024-07-26: + BlackCrystalic: + - qol: if server take too long to pre init all before lobby art, players will see + lobbyart "loading" + Blundir: + - bugfix: fixed runner having no gib animation + - bugfix: fixed gib remains being invisible + - imageadd: boiler gib animation + - imageadd: larva gib remains + - imageadd: shoes icons resprite + Steelpoint: + - imageadd: The Sniper and Anti-Material Rifle Specialists will now use an urban + camouflage sprite for their ghillie suit instead of a green camouflage. + realforest2001: + - rscadd: Synthetics and Yautja now spawn with the Iron Teeth trait, not dropping + items held in their mouth. + rythenx: + - rscadd: more options for hats to ASO vendor to bring it in line with what SO has + available +2024-07-29: + TheManWithNoHands: + - code_imp: adds flags to cone, allowing it to be worn on head + - imageadd: added on mob sprites for cone diff --git a/icons/lobby/title_loading.dmi b/icons/lobby/title_loading.dmi new file mode 100644 index 000000000000..3aa2f5ad52c2 Binary files /dev/null and b/icons/lobby/title_loading.dmi differ diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index 9fc0bc82c123..4a4338eac4c2 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 951c7e89f985..696ab464252d 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index c372b8a6d72c..85266a2077ac 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/xenos/larva.dmi b/icons/mob/xenos/larva.dmi index 72cfb7b4e318..f2e6a31ea36d 100644 Binary files a/icons/mob/xenos/larva.dmi and b/icons/mob/xenos/larva.dmi differ diff --git a/icons/mob/xenos/xenomorph_64x64.dmi b/icons/mob/xenos/xenomorph_64x64.dmi index 3fc4d942cd66..17fd4ae7fd5f 100644 Binary files a/icons/mob/xenos/xenomorph_64x64.dmi and b/icons/mob/xenos/xenomorph_64x64.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 469d7cb7616a..923a26b55c20 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index c1910d21b599..8c39aa77c7d1 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/shoes.dmi b/icons/obj/items/clothing/shoes.dmi index c4e01786e579..90e626503963 100644 Binary files a/icons/obj/items/clothing/shoes.dmi and b/icons/obj/items/clothing/shoes.dmi differ diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 435659e102e2..f335e4c41e8b 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -24911,7 +24911,6 @@ /area/corsat/sigma/south/complex) "bTM" = ( /obj/structure/surface/table/reinforced, -/obj/item/device/suit_cooling_unit, /turf/open/floor/corsat/retrosquareslight, /area/corsat/sigma/south/complex) "bTN" = ( diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 8c9d02f1f3ca..9bf51b294f65 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2531,13 +2531,6 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/command/cic) -"arR" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/machinery/computer/working_joe/bulky, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "arT" = ( /obj/structure/target{ name = "punching bag" @@ -2648,13 +2641,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) -"asN" = ( -/obj/structure/machinery/computer/crew/bulky, -/obj/structure/machinery/status_display{ - pixel_y = -29 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "asQ" = ( /obj/structure/surface/rack, /obj/item/device/radio/marine, @@ -2849,9 +2835,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/command/cic) -"atO" = ( -/turf/open/floor/almayer/silver/west, -/area/almayer/command/cic) "atP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -3270,20 +3253,6 @@ "awz" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cichallway) -"awA" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/machinery/computer/cameras/almayer/bulky{ - network = list("ARES","Alamo","Normandy"); - name = "ARES Core and Dropship Cameras" - }, -/obj/structure/sign/safety/flightcontrol{ - pixel_y = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "awB" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -3316,13 +3285,6 @@ /obj/structure/closet/toolcloset, /turf/open/floor/almayer/redfull, /area/almayer/command/cic) -"awH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/faxmachine/uscm/command{ - pixel_y = 2 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "awQ" = ( /obj/structure/surface/table/almayer, /obj/item/cell/high{ @@ -3640,12 +3602,6 @@ /obj/structure/machinery/prop/almayer/CICmap, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/starboard_missiles) -"ayr" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "ays" = ( /turf/open/floor/almayer/silvercorner, /area/almayer/command/cic) @@ -4374,7 +4330,8 @@ /obj/structure/machinery/computer/cameras/almayer_network/vehicle{ dir = 4; layer = 2.99; - pixel_y = 4 + pixel_y = 4; + network = list("Almayer","Vehicle","brig") }, /obj/structure/machinery/computer/almayer_control{ dir = 4; @@ -5101,14 +5058,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) -"aGH" = ( -/obj/structure/machinery/computer/ordercomp/bulky, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "aGN" = ( /turf/open/floor/almayer, /area/almayer/command/computerlab) @@ -5605,15 +5554,6 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/floor/grass, /area/almayer/living/starboard_garden) -"aKi" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/command/cichallway) "aKk" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -15610,12 +15550,6 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) -"cvZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/silvercorner/north, -/area/almayer/command/cic) "cwo" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = 4 @@ -18322,6 +18256,9 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_aft_hallway) +"dCR" = ( +/turf/open/floor/almayer/silver/west, +/area/almayer/command/cic) "dDp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -19144,6 +19081,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) +"dVF" = ( +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "dVH" = ( /obj/structure/platform{ dir = 8 @@ -19908,13 +19851,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_garden) -"ekZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/warden_office) "elf" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -21443,6 +21379,14 @@ "eRS" = ( /turf/open/floor/almayer/cargo_arrow, /area/almayer/engineering/lower/workshop/hangar) +"eRW" = ( +/obj/structure/machinery/computer/ordercomp/bulky, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "eSk" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -21557,12 +21501,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"eVj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/command/cic) "eVm" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 8; @@ -22369,6 +22307,11 @@ }, /turf/open/floor/almayer/bluecorner, /area/almayer/living/pilotbunks) +"fmO" = ( +/obj/structure/machinery/computer/med_data/bulky, +/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "fmZ" = ( /turf/open/floor/almayer/orange/west, /area/almayer/hallways/lower/starboard_umbilical) @@ -22656,6 +22599,15 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/starboard_point_defense) +"frE" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/command/cichallway) "frF" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -27153,6 +27105,9 @@ "hoK" = ( /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/starboard_hallway) +"hoO" = ( +/turf/open/floor/almayer/silvercorner/west, +/area/almayer/command/cic) "hoT" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) @@ -27523,14 +27478,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"hxm" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 4 - }, -/obj/structure/surface/table/reinforced/black, -/obj/item/device/megaphone, -/turf/open/floor/almayer, -/area/almayer/command/cic) "hxG" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -27894,6 +27841,20 @@ /obj/structure/machinery/meter, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) +"hEz" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/chief_mp_office) "hEV" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -29061,6 +29022,16 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/north1) +"ifu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "ifz" = ( /obj/structure/machinery/keycard_auth{ pixel_x = 25 @@ -29814,9 +29785,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"ixS" = ( -/turf/open/floor/almayer/silver/southwest, -/area/almayer/command/cic) "ixT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -29850,6 +29818,22 @@ }, /turf/open/floor/almayer/blue, /area/almayer/squads/delta) +"iyT" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 19; + layer = 2.99 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + dir = 4; + desc = "Used to access the various cameras in the security brig."; + name = "brig cameras console"; + pixel_y = 5; + layer = 2.99 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "izf" = ( /obj/structure/disposalpipe/up/almayer{ dir = 4; @@ -31584,13 +31568,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"jhI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) "jhK" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -32737,6 +32714,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/port) +"jGe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/silvercorner/north, +/area/almayer/command/cic) "jGn" = ( /obj/structure/machinery/light{ dir = 1 @@ -33158,10 +33141,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) -"jQk" = ( -/obj/structure/machinery/computer/tech_control, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "jQt" = ( /turf/open/floor/almayer/research/containment/floor2/west, /area/almayer/medical/containment/cell) @@ -33762,16 +33741,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"kbX" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "kcg" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -34438,13 +34407,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/gym) -"kry" = ( -/obj/structure/machinery/flasher{ - id = "Perma 1"; - pixel_y = 24 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "krA" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -34628,13 +34590,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) -"kvL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/warden_office) "kvU" = ( /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, @@ -34687,6 +34642,9 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"kwR" = ( +/turf/open/floor/almayer/silver/northwest, +/area/almayer/command/cic) "kxd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35054,6 +35012,14 @@ }, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_lobby) +"kEa" = ( +/obj/item/paper_bin/uscm{ + pixel_y = 4 + }, +/obj/structure/surface/table/reinforced/black, +/obj/item/device/megaphone, +/turf/open/floor/almayer, +/area/almayer/command/cic) "kEc" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -35357,6 +35323,27 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_fore_hallway) +"kLJ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/computer/altitude_control_console, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Flight Control Line 1 Telephone"; + phone_category = "Command"; + phone_id = "CIC Flight Control Line 1"; + pixel_y = 17; + pixel_x = -8 + }, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Flight Control Line 2 Telephone"; + phone_category = "Command"; + phone_id = "CIC Flight Control Line 2"; + pixel_y = 18; + pixel_x = 6 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -36896,17 +36883,6 @@ /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"lrW" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/turf/open/floor/almayer/redfull, -/area/almayer/command/cic) "lrX" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -37991,6 +37967,12 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"lQL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/silver/northwest, +/area/almayer/command/cic) "lQO" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -38289,21 +38271,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) -"lZs" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - pixel_x = -17 - }, -/obj/item/device/flashlight/lamp, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "lZI" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -38614,6 +38581,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) +"mhK" = ( +/obj/structure/machinery/flasher{ + id = "Perma 2"; + pixel_y = 24 + }, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "mis" = ( /turf/open/floor/plating, /area/almayer/maint/upper/u_f_s) @@ -39256,6 +39231,13 @@ }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/lower_medical_lobby) +"mvL" = ( +/obj/structure/machinery/computer/crew/bulky, +/obj/structure/machinery/status_display{ + pixel_y = -29 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "mww" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39709,6 +39691,13 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"mEP" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/machinery/computer/working_joe/bulky, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "mFc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39888,6 +39877,16 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) +"mIt" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -45415,6 +45414,13 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/living/auxiliary_officer_office) +"oQR" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/faxmachine/uscm/command{ + pixel_y = 2 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "oRk" = ( /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/processing) @@ -45642,6 +45648,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/general_equipment) +"oVg" = ( +/obj/structure/machinery/flasher{ + id = "Perma 1"; + pixel_y = 24 + }, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "oVk" = ( /obj/structure/stairs{ dir = 4 @@ -47646,6 +47660,12 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/lower/vehiclehangar) +"pPZ" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/cic) "pQc" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -49574,9 +49594,6 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_a_p) -"qDM" = ( -/turf/open/floor/almayer/silver/northwest, -/area/almayer/command/cic) "qDP" = ( /obj/structure/machinery/light{ dir = 4 @@ -49678,6 +49695,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) +"qFq" = ( +/obj/structure/machinery/computer/tech_control, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "qFu" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -54424,9 +54445,6 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) -"sAO" = ( -/turf/open/floor/almayer/silvercorner/west, -/area/almayer/command/cic) "sAS" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -55573,6 +55591,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/containment/cell) +"taI" = ( +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 4 + }, +/turf/open/floor/almayer/green/west, +/area/almayer/shipboard/brig/cells) "taV" = ( /obj/effect/projector{ name = "Almayer_Down1"; @@ -55664,12 +55688,6 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/lobby) -"tdA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/silver/northwest, -/area/almayer/command/cic) "tdE" = ( /obj/structure/window/reinforced{ dir = 8 @@ -55732,27 +55750,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"teY" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/computer/altitude_control_console, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Flight Control Line 1 Telephone"; - phone_category = "Command"; - phone_id = "CIC Flight Control Line 1"; - pixel_y = 17; - pixel_x = -8 - }, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Flight Control Line 2 Telephone"; - phone_category = "Command"; - phone_id = "CIC Flight Control Line 2"; - pixel_y = 18; - pixel_x = 6 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "teZ" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -57171,6 +57168,17 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) +"tGC" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/turf/open/floor/almayer/redfull, +/area/almayer/command/cic) "tGG" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 1 @@ -57627,6 +57635,12 @@ /obj/item/weapon/gun/rifle/l42a, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) +"tTb" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "tTk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -60539,6 +60553,26 @@ }, /turf/open/floor/almayer/emeraldfull, /area/almayer/living/briefing) +"vex" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/structure/sign/safety/terminal{ + pixel_x = 3; + pixel_y = 27 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 15; + pixel_y = 27 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + dir = 4; + desc = "Used to access the various cameras in the security brig."; + name = "brig cameras console" + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61371,13 +61405,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) -"vsz" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "vsF" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -61720,6 +61747,20 @@ "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) +"vzf" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/machinery/computer/cameras/almayer/bulky{ + network = list("ARES","Alamo","Normandy"); + name = "ARES Core and Dropship Cameras" + }, +/obj/structure/sign/safety/flightcontrol{ + pixel_y = 32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "vzi" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -61903,14 +61944,6 @@ }, /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) -"vCy" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera"; - pixel_y = 6 - }, -/turf/open/floor/almayer/green/west, -/area/almayer/shipboard/brig/cells) "vCE" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -62745,16 +62778,6 @@ }, /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/upper_medical) -"vSl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "vSn" = ( /obj/structure/barricade/handrail/medical{ dir = 4 @@ -62802,6 +62825,21 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) +"vSV" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/machinery/computer/cameras/almayer/vehicle{ + dir = 4; + pixel_x = -17 + }, +/obj/item/device/flashlight/lamp, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "vSW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer/cargo, @@ -63404,6 +63442,13 @@ }, /turf/open/floor/almayer/silver/southwest, /area/almayer/shipboard/brig/cic_hallway) +"wdk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/warden_office) "wdv" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -63941,13 +63986,6 @@ /obj/structure/window/framed/almayer/aicore/hull, /turf/open/floor/plating, /area/almayer/command/airoom) -"wnw" = ( -/obj/structure/machinery/flasher{ - id = "Perma 2"; - pixel_y = 24 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "wnL" = ( /obj/item/stack/tile/carpet{ amount = 12 @@ -64345,19 +64383,6 @@ /obj/structure/filingcabinet, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"wvE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/chief_mp_office) "wvI" = ( /obj/item/paper_bin/uscm{ pixel_y = 7 @@ -66212,24 +66237,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) -"xjF" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 3; - pixel_y = 27 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 15; - pixel_y = 27 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) "xjK" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -66285,6 +66292,9 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/greencorner/east, /area/almayer/hallways/lower/starboard_fore_hallway) +"xkS" = ( +/turf/open/floor/almayer/silver/southwest, +/area/almayer/command/cic) "xlk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -66529,6 +66539,20 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) +"xrm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 10 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + dir = 4; + desc = "Used to access the various cameras in the security brig."; + name = "brig cameras console"; + pixel_y = -11 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/warden_office) "xrq" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -67567,11 +67591,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/starboard) -"xMA" = ( -/obj/structure/machinery/computer/med_data/bulky, -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "xMB" = ( /turf/open/floor/almayer/uscm/directional/southeast, /area/almayer/command/cic) @@ -67716,6 +67735,12 @@ }, /turf/open/floor/almayer/research/containment/corner/east, /area/almayer/medical/containment/cell) +"xPh" = ( +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "xPn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -68608,14 +68633,6 @@ /obj/item/fuel_cell, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) -"yhg" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera"; - pixel_y = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "yht" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -76740,7 +76757,7 @@ uDg uDg lHk naB -wnw +mhK pHp fgl dya @@ -77552,7 +77569,7 @@ hvd bLF eyD naB -kry +oVg pHp fgl xXj @@ -77775,7 +77792,7 @@ iHG dCe moB uns -vCy +taI eyV xkd mkF @@ -78775,7 +78792,7 @@ tpn srT tpn tpn -xjF +vex myP gDt bju @@ -79194,7 +79211,7 @@ nUj eZH tUx vrx -yhg +dVF lbs eZH tUx @@ -80815,7 +80832,7 @@ xkd uvY lSs xkd -kbX +mIt ezX prY rUk @@ -81430,7 +81447,7 @@ tUx tUx tUx tUx -vsz +xPh oEE xkd gNZ @@ -81835,8 +81852,8 @@ emp emp cHk hlI -ekZ -kvL +xrm +wdk oix cHk uxb @@ -83456,8 +83473,8 @@ mPj omy sCQ wIC -wvE -jhI +hEz +iyT jfY bra wIC @@ -87502,7 +87519,7 @@ wVW apo fHh wVW -lZs +vSV lVX sni ayz @@ -87921,7 +87938,7 @@ avY aIf alX eRu -aKi +frE amY aVg aVV @@ -88311,8 +88328,8 @@ agj aic aov wVW -jQk -ixS +qFq +xkS aqN avY alX @@ -88324,8 +88341,8 @@ alX alX avY aqN -tdA -jQk +lQL +qFq wVW aTj aKz @@ -88514,10 +88531,10 @@ agj bFA sxW wVW -arR -sAO -atO -ixS +mEP +hoO +dCR +xkS awt aqN rKd @@ -88525,10 +88542,10 @@ aAA xMB aqN ays -qDM -atO -cvZ -asN +kwR +dCR +jGe +mvL wVW aKn aKz @@ -88717,8 +88734,8 @@ agj aic aoA wVW -teY -eVj +kLJ +pPZ alX alX asc @@ -88731,7 +88748,7 @@ awk alX alX mPn -xMA +fmO wVW aKo aKz @@ -88920,9 +88937,9 @@ agj aic aov wVW -awA -ayr -awH +vzf +tTb +oQR aPD asc azW @@ -88933,8 +88950,8 @@ bPs xUB gkK oug -vSl -aGH +ifu +eRW wVW aKn aKz @@ -89338,7 +89355,7 @@ avY wlE gvq wVW -lrW +tGC mqh vHW wVW @@ -89941,7 +89958,7 @@ ato wVW aKF alX -hxm +kEa deD tUo aIf diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index be0f85e60028..c97821b827fb 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -2211,7 +2211,7 @@ hp hp hp hp -kx +hp "} (2,1,1) = {" aa @@ -3570,7 +3570,7 @@ hp hp hp hp -hp +kx hp hp hp