diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4dfa55a792..a29cf7d360 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -26,6 +26,6 @@ # Zonespace -/code/modules/gear_presets/survivors.dm @zonespace27 +/code/modules/admin/verbs/SDQL2/ @Zonespace27 # MULTIPLE OWNERS diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index de7eb672e8..b466475222 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -44,3 +44,4 @@ var/MAX_EXPLOSION_RANGE = 14 #define VENT_GAS_SMOKE "Smoke" #define VENT_GAS_CN20 "CN20 Nerve Gas" #define VENT_GAS_CN20_XENO "CN20-X Nerve Gas" +#define VENT_GAS_LSD "ALD-91 LSD Gas" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index c0ccd5164b..598cfcdfec 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -11,6 +11,9 @@ //#define AREA_LAYER 1 +#define DISPLACEMENT_PLATE_RENDER_LAYER 1 +#define DISPLACEMENT_PLATE_RENDER_TARGET "*DISPLACEMENT_PLATE_RENDER_TARGET" + #define UNDER_TURF_LAYER 1.99 #define TURF_LAYER 2 diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm index 541d95d281..6c5d2879f3 100644 --- a/code/__DEFINES/sounds.dm +++ b/code/__DEFINES/sounds.dm @@ -1,6 +1,6 @@ #define FALLOFF_SOUNDS 1 -#define FREE_CHAN_END 1016 +#define FREE_CHAN_END 1014 #define INITIAL_SOUNDSCAPE_COOLDOWN 20 #define EAR_DEAF_MUTE 1 @@ -21,6 +21,7 @@ #define ITEM_EQUIP_VOLUME 50 //Reserved channels +#define SOUND_CHANNEL_TEST 1015 #define SOUND_CHANNEL_NOTIFY 1016 #define SOUND_CHANNEL_VOX 1017 #define SOUND_CHANNEL_MUSIC 1018 diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 24e39ff16c..73b494e989 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -920,8 +920,9 @@ world // From /datum/preferences/proc/copy_appearance_to body.age = original.age body.gender = original.gender - body.ethnicity = original.ethnicity + body.skin_color = original.skin_color body.body_type = original.body_type + body.body_size = original.body_size body.r_eyes = original.r_eyes body.g_eyes = original.g_eyes diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 9aa1bdc3ea..38d84c2922 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -1,11 +1,14 @@ #define isdeaf(A) (ismob(A) && ((A?:sdisabilities & DISABILITY_DEAF) || A?:ear_deaf)) #define xeno_hivenumber(A) (isxeno(A) ? A?:hivenumber : FALSE) -/proc/random_ethnicity() - return pick(GLOB.ethnicities_list) +/proc/random_skin_color() + return pick(GLOB.skin_color_list) /proc/random_body_type() - return pick(GLOB.body_types_list) + return pick(GLOB.body_type_list) + +/proc/random_body_size() + return pick(GLOB.body_size_list) /proc/random_hair_style(gender, species = "Human") var/h_style = "Crewcut" diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm index 85e102a3c1..decec60d36 100644 --- a/code/__HELPERS/sanitize_values.dm +++ b/code/__HELPERS/sanitize_values.dm @@ -45,18 +45,24 @@ else return default return default -/proc/sanitize_ethnicity(ethnicity, default = "Western") - if (ethnicity in GLOB.ethnicities_list) - return ethnicity +/proc/sanitize_skin_color(skin_color, default = "Pale 2") + if(skin_color in GLOB.skin_color_list) + return skin_color return default -/proc/sanitize_body_type(body_type, default = "Mesomorphic (Average)") - if (body_type in GLOB.body_types_list) +/proc/sanitize_body_type(body_type, default = "Lean") + if(body_type in GLOB.body_type_list) return body_type return default +/proc/sanitize_body_size(body_size, default = "Average") + if(body_size in GLOB.body_size_list) + return body_size + + return default + /proc/sanitize_hexcolor(color, default="#000000") if(!istext(color)) return default var/len = length(color) diff --git a/code/__pragmas.dm b/code/__pragmas.dm index 39c14e1bbc..84fcc0dfc3 100644 --- a/code/__pragmas.dm +++ b/code/__pragmas.dm @@ -12,7 +12,6 @@ #pragma SoftReservedKeyword error #pragma DuplicateVariable error #pragma DuplicateProcDefinition error -#pragma TooManyArguments error #pragma PointlessParentCall error #pragma PointlessBuiltinCall error #pragma SuspiciousMatrixCall error diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 3ba92a7c4d..c2cfb8263f 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -198,10 +198,11 @@ GLOBAL_LIST_INIT(custom_event_info_list, setup_custom_event_info()) GLOBAL_LIST_INIT(poster_designs, subtypesof(/datum/poster)) //Preferences stuff - // Ethnicities -GLOBAL_REFERENCE_LIST_INDEXED(ethnicities_list, /datum/ethnicity, name) // Stores /datum/ethnicity indexed by name - // Body Types -GLOBAL_REFERENCE_LIST_INDEXED(body_types_list, /datum/body_type, name) // Stores /datum/body_type indexed by name + // Skin colors +GLOBAL_REFERENCE_LIST_INDEXED(skin_color_list, /datum/skin_color, name) // Stores /datum/skin_color indexed by name + // Body +GLOBAL_REFERENCE_LIST_INDEXED(body_type_list, /datum/body_type, name) // Stores /datum/body_type indexed by name +GLOBAL_REFERENCE_LIST_INDEXED(body_size_list, /datum/body_size, name) // Stores /datum/body_size indexed by name //Hairstyles GLOBAL_REFERENCE_LIST_INDEXED(hair_styles_list, /datum/sprite_accessory/hair, name) //stores /datum/sprite_accessory/hair indexed by name GLOBAL_REFERENCE_LIST_INDEXED(facial_hair_styles_list, /datum/sprite_accessory/facial_hair, name) //stores /datum/sprite_accessory/facial_hair indexed by name diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index 6504db0d9f..49dfdf35e3 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -25,7 +25,7 @@ * If you are diagonally adjacent, ensure you can pass through at least one of the mutually adjacent square. * Passing through in this case ignores anything with the throwpass flag, such as tables, racks, and morgue trays. */ -/turf/Adjacent(atom/neighbor, atom/target = null) +/turf/Adjacent(atom/neighbor, atom/target = null, list/ignore_list) var/turf/T0 = get_turf(neighbor) if(T0 == src) return TRUE @@ -34,7 +34,7 @@ if(T0.x == x || T0.y == y) // Check for border blockages - return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target) + return T0.ClickCross(get_dir(T0,src), border_only = 1, ignore_list = ignore_list) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target, ignore_list = ignore_list) // Not orthagonal var/in_dir = get_dir(neighbor,src) // eg. northwest (1+8) @@ -42,14 +42,14 @@ var/d2 = in_dir - d1 // eg north (1+8) - 8 = 1 for(var/d in list(d1,d2)) - if(!T0.ClickCross(d, border_only = 1)) + if(!T0.ClickCross(d, border_only = 1, ignore_list = ignore_list)) continue // could not leave T0 in that direction var/turf/T1 = get_step(T0,d) - if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0)|get_dir(T1,src), border_only = 0)) + if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0)|get_dir(T1,src), border_only = 0, ignore_list = ignore_list)) continue // couldn't enter or couldn't leave T1 - if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target)) + if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target, ignore_list = ignore_list)) continue // could not enter src return TRUE // we don't care about our own density @@ -131,8 +131,11 @@ Quick adjacency (to turf): This is defined as any dense ON_BORDER object, or any dense object without throwpass. The border_only flag allows you to not objects (for source and destination squares) */ -/turf/proc/ClickCross(target_dir, border_only, target_atom = null) +/turf/proc/ClickCross(target_dir, border_only, target_atom = null, list/ignore_list) for(var/obj/O in src) + if(O in ignore_list) + continue + if(!O.density || O == target_atom || O.throwpass) continue // throwpass is used for anything you can click through diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index 91c0e24fae..c337ee198e 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -175,3 +175,10 @@ plane = ESCAPE_MENU_PLANE appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR render_relay_plane = RENDER_PLANE_MASTER + +/atom/movable/screen/plane_master/displacement + name = "displacement plane" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + plane = DISPLACEMENT_PLATE_RENDER_LAYER + render_target = DISPLACEMENT_PLATE_RENDER_TARGET + render_relay_plane = null diff --git a/code/_onclick/hud/rendering/render_plate.dm b/code/_onclick/hud/rendering/render_plate.dm index 18236c6ee7..cb579eb4ff 100644 --- a/code/_onclick/hud/rendering/render_plate.dm +++ b/code/_onclick/hud/rendering/render_plate.dm @@ -39,6 +39,10 @@ plane = RENDER_PLANE_GAME render_relay_plane = RENDER_PLANE_MASTER +/atom/movable/screen/plane_master/rendering_plate/game_world/Initialize(mapload, datum/hud/hud_owner) + . = ..() + add_filter("displacer", 1, displacement_map_filter(render_source = DISPLACEMENT_PLATE_RENDER_TARGET, size = 10)) + ///render plate for OOC stuff like ghosts, hud-screen effects, etc /atom/movable/screen/plane_master/rendering_plate/non_game name = "non-game rendering plate" diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index b65ca1e758..ba07898dec 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -212,17 +212,23 @@ SUBSYSTEM_DEF(statpanels) /// Sets the current tab to the SDQL tab /datum/controller/subsystem/statpanels/proc/set_SDQL2_tab(client/target) + if(!target) + return + var/list/sdql2_initial = list() - //sdql2_initial[length(sdql2_initial)++] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj)) + sdql2_initial[++sdql2_initial.len] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj)) var/list/sdql2_querydata = list() - //for(var/datum/sdql2_query/query as anything in GLOB.sdql2_queries) - //sdql2_querydata = query.generate_stat() + for(var/datum/sdql2_query/query as anything in GLOB.sdql2_queries) + sdql2_querydata += query.generate_stat() sdql2_initial += sdql2_querydata target.stat_panel.send_message("update_sdql2", sdql2_initial) ///immediately update the active statpanel tab of the target client /datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target) + if(!target) + return FALSE + if(!target.stat_panel.is_ready()) return FALSE diff --git a/code/datums/ammo/bullet/pistol.dm b/code/datums/ammo/bullet/pistol.dm index 488b4e22c8..1c39d4ac99 100644 --- a/code/datums/ammo/bullet/pistol.dm +++ b/code/datums/ammo/bullet/pistol.dm @@ -8,7 +8,7 @@ /datum/ammo/bullet/pistol name = "pistol bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM - accuracy = -HIT_ACCURACY_TIER_3 + accuracy = HIT_ACCURACY_TIER_3 accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 damage = 40 penetration= ARMOR_PENETRATION_TIER_2 @@ -98,7 +98,7 @@ /datum/ammo/bullet/pistol/heavy name = "heavy pistol bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM - accuracy = -HIT_ACCURACY_TIER_3 + accuracy = HIT_ACCURACY_TIER_3 accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 damage = 55 penetration = ARMOR_PENETRATION_TIER_3 @@ -140,7 +140,7 @@ name = ".50 heavy pistol bullet" damage = 45 headshot_state = HEADSHOT_OVERLAY_HEAVY - accuracy = -HIT_ACCURACY_TIER_3 + accuracy = HIT_ACCURACY_TIER_3 accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 penetration = ARMOR_PENETRATION_TIER_6 shrapnel_chance = SHRAPNEL_CHANCE_TIER_5 diff --git a/code/datums/ammo/bullet/shotgun.dm b/code/datums/ammo/bullet/shotgun.dm index c5f81a67c0..95db0c6c39 100644 --- a/code/datums/ammo/bullet/shotgun.dm +++ b/code/datums/ammo/bullet/shotgun.dm @@ -155,6 +155,7 @@ /datum/ammo/bullet/shotgun/buckshot/special name = "buckshot shell, USCM special type" + handful_state = "special_buck" bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/special accurate_range = 8 diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index bdb284753d..2fcc92d7d2 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -51,6 +51,8 @@ /datum/ammo/flamethrower/tank_flamer flamer_reagent_type = /datum/reagent/napalm/blue + max_range = 8 + /datum/ammo/flamethrower/sentry_flamer flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME flamer_reagent_type = /datum/reagent/napalm/blue @@ -265,6 +267,9 @@ nade_type = /obj/item/explosive/grenade/smokebomb icon_state = "smoke_shell" +/datum/ammo/grenade_container/tank_glauncher + max_range = 8 + /datum/ammo/hugger_container name = "hugger shell" ping = null diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index 53da7953d4..3d649ffc3f 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -143,6 +143,8 @@ return return ..() +/datum/ammo/rocket/ap/tank_towlauncher + max_range = 8 /datum/ammo/rocket/ltb name = "cannon round" diff --git a/code/datums/autocells/explosion.dm b/code/datums/autocells/explosion.dm index 0b54a53a57..2efc7a8a3e 100644 --- a/code/datums/autocells/explosion.dm +++ b/code/datums/autocells/explosion.dm @@ -282,6 +282,9 @@ as having entered the turf. if(QDELETED(E)) return + if(power >= 150) //shockwave for anything over 150 power + new /obj/effect/shockwave(epicenter, power/60) + E.power = power E.power_falloff = falloff E.falloff_shape = falloff_shape diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 7c50c34338..26ef0e5d0a 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -355,31 +355,38 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) var/icon/icobase = H.species.icobase var/icon/temp - var/datum/ethnicity/ET = GLOB.ethnicities_list[H.ethnicity] - var/datum/body_type/B = GLOB.body_types_list[H.body_type] + var/datum/skin_color/set_skin_color = GLOB.skin_color_list[H.skin_color] + var/datum/body_type/set_body_type = GLOB.body_type_list[H.body_type] + var/datum/body_size/set_body_size = GLOB.body_size_list[H.body_size] - var/e_icon - var/b_icon + var/skin_color_icon + var/body_type_icon + var/body_size_icon - if (!ET) - e_icon = "western" + if(!set_skin_color) + skin_color_icon = "pale2" else - e_icon = ET.icon_name + skin_color_icon = set_skin_color.icon_name - if (!B) - b_icon = "mesomorphic" + if(!set_body_type) + body_type_icon = "lean" else - b_icon = B.icon_name + body_type_icon = set_body_type.icon_name - preview_icon = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, "torso", e_icon)) - temp = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, "groin", e_icon)) + if(!set_body_size) + body_size_icon = "avg" + else + body_size_icon = set_body_size.icon_name + + preview_icon = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, "torso", skin_color_icon)) + temp = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, "groin", skin_color_icon)) preview_icon.Blend(temp, ICON_OVERLAY) - temp = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, "head", e_icon)) + temp = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, "head", skin_color_icon)) preview_icon.Blend(temp, ICON_OVERLAY) for(var/obj/limb/E in H.limbs) if(E.status & LIMB_DESTROYED) continue - temp = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, E.name, e_icon)) + temp = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, E.name, skin_color_icon)) if(E.status & LIMB_ROBOT) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) preview_icon.Blend(temp, ICON_OVERLAY) diff --git a/code/datums/global_variables.dm b/code/datums/global_variables.dm index 953f42f172..53e9c0391e 100644 --- a/code/datums/global_variables.dm +++ b/code/datums/global_variables.dm @@ -118,15 +118,11 @@ /client/proc/debug_global_variable(name, value, level) var/html = "" - var/change = 0 //to make the value bold if changed if(!(admin_holder.rights & R_DEBUG)) return html html += "
  • EC " - if(value != initial(global.vars[name])) - html += "" - change = 1 if (isnull(value)) html += "[name] = null" @@ -175,8 +171,6 @@ else html += "[name] = [value]" - if(change) - html += "" html += "
    • " @@ -353,7 +347,6 @@ if(admin_holder && admin_holder.marked_datum) possible_classes += "marked datum" possible_classes += "edit referenced object" - possible_classes += "restore to default" class = tgui_input_list(usr, "What kind of variable?","Variable Type", possible_classes) if(!class) @@ -365,9 +358,6 @@ mod_list(global.vars[variable]) return - if("restore to default") - global.vars[variable] = initial(global.vars[variable]) - if("edit referenced object") return .(global.vars[variable]) diff --git a/code/datums/keybinding/mob.dm b/code/datums/keybinding/mob.dm index b7b83249b3..b2bf989a7a 100644 --- a/code/datums/keybinding/mob.dm +++ b/code/datums/keybinding/mob.dm @@ -2,16 +2,6 @@ category = CATEGORY_HUMAN weight = WEIGHT_MOB -/datum/keybinding/mob/down(client/user) - . = ..() - if(isobserver(user.mob)) - return TRUE - -/datum/keybinding/mob/up(client/user) - . = ..() - if(isobserver(user.mob)) - return TRUE - /datum/keybinding/mob/stop_pulling hotkey_keys = list("H", "Delete") classic_keys = list("Delete") diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 7e6658d9c1..c2d05bd786 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -8,6 +8,10 @@ United States Colonial Marines name = "Private" //same as default +/datum/skills/pfc/recon + name = "Recon Private" + skills = list(SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED) + /datum/skills/combat_medic name = "Combat Medic" skills = list( @@ -16,6 +20,15 @@ United States Colonial Marines SKILL_JTAC = SKILL_JTAC_BEGINNER, ) +/datum/skills/combat_medic/recon + name = "Recon Medic" + skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + /datum/skills/combat_engineer name = "Combat Engineer" skills = list( @@ -32,6 +45,16 @@ United States Colonial Marines SKILL_JTAC = SKILL_JTAC_BEGINNER, ) +/datum/skills/smartgunner/recon + name = "Recon Smartgunner" + skills = list( + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + + + /datum/skills/specialist name = "Squad Weapons Specialist" skills = list( @@ -51,6 +74,15 @@ United States Colonial Marines SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) +/datum/skills/tl/recon + name = "Recon Fireteam Leader" + skills = list( + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + + /datum/skills/SL name = "Squad Leader" skills = list( diff --git a/code/datums/soundOutput.dm b/code/datums/soundOutput.dm index 1f4512b28d..85548d6c90 100644 --- a/code/datums/soundOutput.dm +++ b/code/datums/soundOutput.dm @@ -13,7 +13,7 @@ . = ..() /datum/soundOutput/proc/process_sound(datum/sound_template/T) - var/sound/S = sound(T.file, T.wait, T.repeat) + var/sound/S = sound(T.file, T.repeat, T.wait) S.volume = owner.volume_preferences[T.volume_cat] * T.volume if(T.channel == 0) S.channel = get_free_channel() @@ -21,6 +21,8 @@ S.channel = T.channel S.frequency = T.frequency S.falloff = T.falloff + S.offset = T.offset + S.pitch = T.pitch S.status = T.status S.echo = T.echo if(T.x && T.y && T.z) diff --git a/code/datums/vehicles.dm b/code/datums/vehicles.dm index 4c74ece75d..9370909eba 100644 --- a/code/datums/vehicles.dm +++ b/code/datums/vehicles.dm @@ -42,6 +42,10 @@ name = "Tank" interior_id = "tank" +/datum/map_template/interior/aev + name = "AEV" + interior_id = "aev" + /datum/map_template/interior/van name = "Van" interior_id = "van" diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm index a1e2ade2b7..b4612f10f4 100644 --- a/code/defines/procs/records.dm +++ b/code/defines/procs/records.dm @@ -6,7 +6,7 @@ G.fields["real_rank"] = "Unassigned" G.fields["sex"] = "Male" G.fields["age"] = "Unknown" - G.fields["ethnicity"] = "Unknown" + G.fields["skin_color"] = "Unknown" G.fields["p_stat"] = "Active" G.fields["m_stat"] = "Stable" G.fields["species"] = "Human" diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index d0bcf73778..52d4e98396 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -165,6 +165,7 @@ list("Pill Bottle (Kelotane)", round(scale * 3), /obj/item/storage/pill_bottle/kelotane, VENDOR_ITEM_REGULAR), list("Pill Bottle (Peridaxon)", round(scale * 2), /obj/item/storage/pill_bottle/peridaxon, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", round(scale * 3), /obj/item/storage/pill_bottle/tramadol, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Tricordazine)", round(scale * 3), /obj/item/storage/pill_bottle/tricord, VENDOR_ITEM_REGULAR), list("MEDICAL UTILITIES", -1, null, null), list("Surgical Line", round(scale * 2), /obj/item/tool/surgery/surgical_line, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 1bfa2792de..465edd3c24 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -157,7 +157,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -336,3 +335,33 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, list( /obj/structure/machinery/cm_vending/clothing/medic/forecon/get_listed_products(mob/user) return GLOB.cm_vending_clothing_forecon_medic + + +// Chemical vendor + +GLOBAL_LIST_INIT(cm_vending_chemical_medic, list( + list("PILL BOTTLES", 0, null, null, null), + list("Pill Bottle (Imidazoline-Alkysine)", 40, /obj/item/storage/pill_bottle/imialk, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Meralyne-Bicardine)", 40, /obj/item/storage/pill_bottle/merabica, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Kelotane-Dermaline)", 40, /obj/item/storage/pill_bottle/keloderm, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Nitrogen-Water)", 40, /obj/item/storage/pill_bottle/nitrogenwater, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Dexalin+)", 40, /obj/item/storage/pill_bottle/dexalinplus, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Iron)", 40, /obj/item/storage/pill_bottle/iron, null, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/gear/medic_chemical + name = "\improper ColMarTech Squad Medical Chemical Rack" + desc = "An automated gear rack for specialized chemicals for the hospital corpsman." + icon_state = "med_chem" + show_points = TRUE + use_snowflake_points = TRUE + vendor_role = list(JOB_SQUAD_MEDIC) + req_access = list(ACCESS_MARINE_MEDPREP) + +/obj/structure/machinery/cm_vending/gear/medic_chemical/get_listed_products(mob/user) + return GLOB.cm_vending_chemical_medic + +/obj/structure/machinery/cm_vending/gear/medic_chemical/upp + name = "\improper UnTech Squad Medical Equipment Rack" + req_access = list(ACCESS_UPP_MEDPREP) + vendor_theme = VENDOR_THEME_UPP diff --git a/code/game/objects/effects/effect.dm b/code/game/objects/effects/effect.dm index 96de3cd931..a1f0721484 100644 --- a/code/game/objects/effects/effect.dm +++ b/code/game/objects/effects/effect.dm @@ -1,5 +1,6 @@ /obj/effect icon = 'icons/effects/effects.dmi' + blocks_emissive = EMISSIVE_BLOCK_GENERIC /obj/effect/get_applying_acid_time() return -1 diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index b80f53b14d..4cd3c4a37d 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -258,6 +258,7 @@ var/xeno_affecting = FALSE opacity = FALSE alpha = 75 + time_to_live = 20 /obj/effect/particle_effect/smoke/cn20/xeno name = "CN20-X nerve gas" @@ -276,10 +277,14 @@ /obj/effect/particle_effect/smoke/cn20/affect(mob/living/carbon/creature) var/mob/living/carbon/xenomorph/xeno_creature var/mob/living/carbon/human/human_creature + var/datum/internal_organ/lungs/lungs + var/datum/internal_organ/eyes/eyes if(isxeno(creature)) xeno_creature = creature else if(ishuman(creature)) human_creature = creature + lungs = human_creature.internal_organs_by_name["lungs"] + eyes = human_creature.internal_organs_by_name["eyes"] if(!istype(creature) || issynth(creature) || creature.stat == DEAD) return FALSE if(!xeno_affecting && xeno_creature) @@ -297,14 +302,18 @@ if(xeno_creature) if(xeno_creature.interference < 4) to_chat(xeno_creature, SPAN_XENOHIGHDANGER("Your awareness dims to a small area!")) + creature.apply_damage(20, BRUTE) xeno_creature.interference = 10 xeno_creature.blinded = TRUE else - creature.apply_damage(12, OXY) + creature.apply_damage(12, TOX) + creature.apply_damage(2, BRAIN) + lungs.take_damage(2) creature.SetEarDeafness(max(creature.ear_deaf, round(effect_amt*1.5))) //Paralysis of hearing system, aka deafness - if(!xeno_creature && !creature.eye_blind) //Eye exposure damage + if(!xeno_creature) //Eye exposure damage to_chat(creature, SPAN_DANGER("Your eyes sting. You can't see!")) creature.SetEyeBlind(round(effect_amt/3)) + eyes.take_damage(2) if(!xeno_creature && creature.coughedtime != 1 && !creature.stat) //Coughing/gasping creature.coughedtime = 1 if(prob(50)) @@ -330,6 +339,40 @@ human_creature.recalculate_move_delay = TRUE return TRUE +///////////////////////////////////////////// +// ALD-91 LSD Gas +///////////////////////////////////////////// + +/obj/effect/particle_effect/smoke/LSD + name = "ALD-91 LSD Gas" + smokeranking = SMOKE_RANK_HIGH + color = "#6e006e" + opacity = FALSE + alpha = 75 + time_to_live = 20 + var/stun_chance = 60 + +/obj/effect/particle_effect/smoke/LSD/Move() + . = ..() + for(var/mob/living/carbon/human/human in get_turf(src)) + affect(human) + +/obj/effect/particle_effect/smoke/LSD/affect(mob/living/carbon/human/creature) + if(!istype(creature) || issynth(creature) || creature.stat == DEAD || isyautja(creature)) + return FALSE + + if(creature.wear_mask && (creature.wear_mask.flags_inventory & BLOCKGASEFFECT)) + return FALSE + if(creature.head.flags_inventory & BLOCKGASEFFECT) + return FALSE + + creature.hallucination += 15 + creature.druggy += 1 + + if(prob(stun_chance)) + creature.apply_effect(1, WEAKEN) + + ////////////////////////////////////// // FLASHBANG SMOKE //////////////////////////////////// @@ -633,6 +676,9 @@ /datum/effect_system/smoke_spread/cn20/xeno smoke_type = /obj/effect/particle_effect/smoke/cn20/xeno +/datum/effect_system/smoke_spread/LSD + smoke_type = /obj/effect/particle_effect/smoke/LSD + // XENO SMOKES /datum/effect_system/smoke_spread/xeno_acid diff --git a/code/game/objects/effects/temporary_visuals.dm b/code/game/objects/effects/temporary_visuals.dm index 4dc07b76f3..1f3800fa01 100644 --- a/code/game/objects/effects/temporary_visuals.dm +++ b/code/game/objects/effects/temporary_visuals.dm @@ -96,3 +96,25 @@ splatter_type = "csplatter" color = BLOOD_COLOR_SYNTHETIC +//------------------------------------------ +//Shockwaves +//------------------------------------------ + +/obj/effect/shockwave + icon = 'icons/effects/light_overlays/shockwave.dmi' + icon_state = "shockwave" + plane = DISPLACEMENT_PLATE_RENDER_LAYER + pixel_x = -496 + pixel_y = -496 + +/obj/effect/shockwave/Initialize(mapload, radius, speed, easing_type = LINEAR_EASING, y_offset, x_offset) + . = ..() + if(!speed) + speed = 1 + if(y_offset) + pixel_y += y_offset + if(x_offset) + pixel_x += x_offset + QDEL_IN(src, 0.5 * radius * speed) + transform = matrix().Scale(32 / 1024, 32 / 1024) + animate(src, time = 0.5 * radius * speed, transform=matrix().Scale((32 / 1024) * radius * 1.5, (32 / 1024) * radius * 1.5), easing = easing_type) diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index 46d2d4eba9..36ba614041 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -484,7 +484,7 @@ /// The typepath of the nerve gas var/nerve_gas_type = /datum/effect_system/smoke_spread/cn20 /// The radius the gas will reach - var/nerve_gas_radius = 2 + var/nerve_gas_radius = 4 /obj/item/explosive/grenade/nerve_gas/Initialize(mapload, ...) . = ..() @@ -505,6 +505,38 @@ name = "\improper CN20-X canister grenade" nerve_gas_type = /datum/effect_system/smoke_spread/cn20/xeno +/* +//================================================ + LSD Gas Grenades +//================================================ +*/ +/obj/item/explosive/grenade/LSD + name = "\improper ALD-91 canister grenade" + desc = "A canister grenade of nonlethal LSD gas. It is set to detonate in 4 seconds." + icon_state = "flashbang2"//temp icon + det_time = 40 + item_state = "grenade_phos_clf"//temp icon + underslug_launchable = FALSE + harmful = TRUE + antigrief_protection = FALSE + var/datum/effect_system/smoke_spread/LSD/LSD_gas + var/LSD_gas_radius = 4 + +/obj/item/explosive/grenade/LSD/Initialize() + . = ..() //if it ain't broke don't fix it + LSD_gas = new /datum/effect_system/smoke_spread/LSD + LSD_gas.attach(src) + +/obj/item/explosive/grenade/LSD/Destroy() + QDEL_NULL(LSD_gas) + return ..() + +/obj/item/explosive/grenade/LSD/prime() + playsound(src.loc, 'sound/effects/smoke.ogg', 25, 1, 4) + LSD_gas.set_up(LSD_gas_radius, 0, get_turf(src), null, 6) + LSD_gas.start() + qdel(src) + /* //================================================ Airburst Smoke Grenades diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index 682215be67..c1544d6d73 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -200,7 +200,7 @@ to_chat(user, SPAN_WARNING("You know this already!")) return FALSE - if(user.job != JOB_SQUAD_MARINE) + if(!(user.job in JOB_SQUAD_ROLES_LIST)) to_chat(user, SPAN_WARNING("Only squad riflemen can use this.")) return FALSE diff --git a/code/game/objects/items/reagent_containers/food/cans.dm b/code/game/objects/items/reagent_containers/food/cans.dm index aab2ee066e..d6d1b9b423 100644 --- a/code/game/objects/items/reagent_containers/food/cans.dm +++ b/code/game/objects/items/reagent_containers/food/cans.dm @@ -270,7 +270,7 @@ /obj/item/reagent_container/food/drinks/cans/boda name = "\improper Boda" desc = "State regulated soda beverage. Enjoy comrades." - desc_lore = "Designed back in 2159, the advertising campaign for BODA started out as an attempt by the UPP to win the hearts and minds of colonists and settlers across the galaxy. Soon after, the ubiquitous cyan vendors and large supplies of the drink began to crop up in UA warehouses with seemingly no clear origin. Despite some concerns, after initial testing determined that the stored products were safe for consumption and surprisingly popular when blind-tested with focus groups, the strange surplus of BODA was authorized for usage within the UA-associated colonies. Subsequently, it enjoyed a relative popularity before falling into obscurity in the coming decades as supplies dwindled." + desc_lore = "Designed back in 2159, the advertising campaign for BODA started out as an attempt by the UPP to win the hearts and minds of colonists and settlers across the galaxy. Soon after, the ubiquitous cyan vendors and large supplies of the drink began to crop up in UA warehouses with seemingly no clear origin. Despite some concerns, after initial testing determined that the stored products were safe for consumption and surprisingly popular when blind-tested with focus groups, the strange surplus of BODA was authorized for usage within the UA-associated colonies. Subsequently, it enjoyed a relative popularity before falling into obscurity in the coming decades as supplies dwindled." icon_state = "boda" center_of_mass = "x=16;y=10" @@ -347,10 +347,6 @@ icon_state = "souto_diet_classic" item_state = "souto_diet_classic" -/obj/item/reagent_container/food/drinks/cans/souto/diet/Initialize() - . = ..() - reagents.add_reagent("water", 25) - /obj/item/reagent_container/food/drinks/cans/souto/classic name = "\improper Souto Classic" desc = "The can boldly proclaims it to be tangerine flavored. You can't help but think that's a lie. Canned in Havana." @@ -359,7 +355,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/classic/Initialize() . = ..() - reagents.add_reagent("souto_classic", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_classic", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/classic name = "\improper Diet Souto" @@ -369,7 +367,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/classic/Initialize() . = ..() - reagents.add_reagent("souto_classic", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_classic", 20) /obj/item/reagent_container/food/drinks/cans/souto/cherry name = "\improper Cherry Souto" @@ -379,7 +379,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/cherry/Initialize() . = ..() - reagents.add_reagent("souto_cherry", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_cherry", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/cherry name = "\improper Diet Cherry Souto" @@ -389,7 +391,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/cherry/Initialize() . = ..() - reagents.add_reagent("souto_cherry", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_cherry", 20) /obj/item/reagent_container/food/drinks/cans/souto/lime name = "\improper Lime Souto" @@ -399,7 +403,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/lime/Initialize() . = ..() - reagents.add_reagent("souto_lime", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_lime", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/lime name = "\improper Diet Lime Souto" @@ -409,7 +415,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/lime/Initialize() . = ..() - reagents.add_reagent("souto_lime", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_lime", 20) /obj/item/reagent_container/food/drinks/cans/souto/grape name = "\improper Grape Souto" @@ -419,7 +427,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/grape/Initialize() . = ..() - reagents.add_reagent("souto_grape", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_grape", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/grape name = "\improper Diet Grape Souto" @@ -429,7 +439,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/grape/Initialize() . = ..() - reagents.add_reagent("souto_grape", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_grape", 20) /obj/item/reagent_container/food/drinks/cans/souto/blue name = "\improper Blue Raspberry Souto" @@ -440,7 +452,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/blue/Initialize() . = ..() - reagents.add_reagent("souto_blueraspberry", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_blueraspberry", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/blue name = "\improper Diet Blue Raspberry Souto" @@ -450,7 +464,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/blue/Initialize() . = ..() - reagents.add_reagent("souto_blueraspberry", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_blueraspberry", 20) /obj/item/reagent_container/food/drinks/cans/souto/peach name = "\improper Peach Souto" @@ -460,7 +476,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/peach/Initialize() . = ..() - reagents.add_reagent("souto_peach", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_peach", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/peach name = "\improper Diet Peach Souto" @@ -470,7 +488,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/peach/Initialize() . = ..() - reagents.add_reagent("souto_peach", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_peach", 20) /obj/item/reagent_container/food/drinks/cans/souto/cranberry name = "\improper Cranberry Souto" @@ -480,7 +500,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/cranberry/Initialize() . = ..() - reagents.add_reagent("souto_cranberry", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_cranberry", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry name = "\improper Diet Cranberry Souto" @@ -490,8 +512,9 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry/Initialize() . = ..() - reagents.add_reagent("souto_cranberry", 25) - reagents.add_reagent("water", 25) + reagents.add_reagent("sucralose", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_cranberry", 20) /obj/item/reagent_container/food/drinks/cans/souto/vanilla name = "\improper Vanilla Souto" @@ -511,29 +534,32 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/vanilla/Initialize() . = ..() + reagents.add_reagent("sodawater", 25) reagents.add_reagent("souto_vanilla", 25) - reagents.add_reagent("water", 25) /obj/item/reagent_container/food/drinks/cans/souto/pineapple name = "\improper Pineapple Souto" - desc = "This tastes like battery acid with a full cup of sugar mixed in. Canned in Havana." + desc = "This tastes like battery acid with a full cup of corn syrup mixed in. Canned in Havana." icon_state = "souto_pineapple" item_state = "souto_pineapple" /obj/item/reagent_container/food/drinks/cans/souto/pineapple/Initialize() . = ..() - reagents.add_reagent("souto_pineapple", 50) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_pineapple", 20) /obj/item/reagent_container/food/drinks/cans/souto/diet/pineapple name = "\improper Diet Pineapple Souto" - desc = "This tastes like battery acid with a half cup of sugar mixed in. Canned in Havana." + desc = "This tastes like battery acid with a full cup of sugar substitute mixed in. Canned in Havana." icon_state = "souto_diet_pineapple" item_state = "souto_diet_pineapple" /obj/item/reagent_container/food/drinks/cans/souto/diet/pineapple/Initialize() . = ..() - reagents.add_reagent("souto_pineapple", 25) - reagents.add_reagent("water", 25) + reagents.add_reagent("cornsyrup", 15) + reagents.add_reagent("sodawater", 15) + reagents.add_reagent("souto_pineapple", 20) //ASPEN diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index 6c71d8be3c..d82f3bb338 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -178,6 +178,11 @@ pill_initial_reagents = list("kelotane" = 15) pill_icon_class = "kelo" +/obj/item/reagent_container/pill/keloderm + pill_desc = "A Kelotane-Dermaline pill. Used to rapidly treat burns." + pill_initial_reagents = list("kelotane" = 10, "dermaline" = 10) + pill_icon_class = "kelo" + /obj/item/reagent_container/pill/oxycodone pill_desc = "A Oxycodone pill. A powerful painkiller." pill_initial_reagents = list("oxycodone" = 15) @@ -213,6 +218,11 @@ pill_initial_reagents = list("dexalin" = 15) pill_icon_class = "dex" +/obj/item/reagent_container/pill/dexalinplus + pill_desc = "A Dexalin+ pill. Used to instantly treat oxygen deprivation." + pill_initial_reagents = list("dexalinp" = 10) + pill_icon_class = "qc" + /obj/item/reagent_container/pill/spaceacillin pill_desc = "A Spaceacillin pill. Used to slow down viral infections." pill_initial_reagents = list("spaceacillin" = 10) @@ -248,11 +258,21 @@ pill_initial_reagents = list("alkysine" = 10) pill_icon_class = "alky" +/obj/item/reagent_container/pill/imialk + pill_desc = "A pill containing Imidazoline and Alkysine, used to heal brain and ear damage." + pill_initial_reagents = list("imidazoline" = 10, "alkysine" = 10) + pill_icon_class = "imi" + /obj/item/reagent_container/pill/bicaridine pill_desc = "A Bicaridine pill. Heals brute damage." pill_initial_reagents = list("bicaridine" = 15) pill_icon_class = "bica" +/obj/item/reagent_container/pill/merabica + pill_desc = "A Meralyne-Bicaridine pill. Rapidly heals brute damage." + pill_initial_reagents = list("bicaridine" = 10, "meralyne" = 10) + pill_icon_class = "bica" + /obj/item/reagent_container/pill/ultrazine pill_desc = "An Ultrazine pill. A highly-potent, long-lasting combination CNS and muscle stimulant. Extremely addictive." pill_initial_reagents = list("ultrazine" = 5) @@ -269,3 +289,13 @@ /obj/item/reagent_container/pill/stimulant pill_initial_reagents = list("antag_stimulant" = 10) pill_icon_class = "stim" + +/obj/item/reagent_container/pill/iron + pill_desc = "An iron pill. Used to regenerate blood." + pill_initial_reagents = list("iron" = 15) + pill_icon_class = "spac" + +/obj/item/reagent_container/pill/nitrogenwater + pill_desc = "A pill containing nitrogen and water. Used to treat Tramadol overdoses." + pill_initial_reagents = list("nitrogen" = 15, "water" = 15) + pill_icon_class = "spac" diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 2514e2e5f1..49f790410c 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -536,6 +536,12 @@ /obj/item/storage/pill_bottle/kelotane/skillless skilllock = SKILL_MEDICAL_DEFAULT +/obj/item/storage/pill_bottle/keloderm + name = "\improper Kelotane-Dermaline pill bottle" + icon_state = "pill_canister15" + pill_type_to_fill = /obj/item/reagent_container/pill/keloderm + maptext_label = "KD" + /obj/item/storage/pill_bottle/antitox name = "\improper Dylovene pill bottle" icon_state = "pill_canister6" @@ -582,6 +588,12 @@ /obj/item/storage/pill_bottle/bicaridine/skillless skilllock = SKILL_MEDICAL_DEFAULT +/obj/item/storage/pill_bottle/merabica + name = "\improper Meralyne-Bicaridine pill bottle" + icon_state = "pill_canister8" + pill_type_to_fill = /obj/item/reagent_container/pill/merabica + maptext_label = "MB" + /obj/item/storage/pill_bottle/dexalin name = "\improper Dexalin pill bottle" icon_state = "pill_canister1" @@ -591,6 +603,12 @@ /obj/item/storage/pill_bottle/dexalin/skillless skilllock = SKILL_MEDICAL_DEFAULT +/obj/item/storage/pill_bottle/dexalinplus + name = "\improper Dexalin+ pill bottle" + icon_state = "pill_canister13" + pill_type_to_fill = /obj/item/reagent_container/pill/dexalinplus + maptext_label = "D+" + //Alkysine /obj/item/storage/pill_bottle/alkysine name = "\improper Alkysine pill bottle" @@ -720,6 +738,30 @@ skilllock = SKILL_MEDICAL_DEFAULT maptext_label = "Pc" +/obj/item/storage/pill_bottle/imialk + name = "\improper Imidazoline-Alkysine pill bottle" + icon_state = "pill_canister14" + pill_type_to_fill = /obj/item/reagent_container/pill/imialk + maptext_label = "IA" + +/obj/item/storage/pill_bottle/iron + name = "\improper Iron pill bottle" + icon_state = "pill_canister4" + pill_type_to_fill = /obj/item/reagent_container/pill/iron + maptext_label = "FE" + +/obj/item/storage/pill_bottle/nitrogenwater + name = "\improper Nitrogen-Water pill bottle" + icon_state = "pill_canister12" + pill_type_to_fill = /obj/item/reagent_container/pill/nitrogenwater + maptext_label = "NW" + +/obj/item/storage/pill_bottle/tricord + name = "\improper Tricordazine pill bottle" + icon_state = "pill_canister" + pill_type_to_fill = /obj/item/reagent_container/pill/tricordrazine + maptext_label = "Ti" + //---------PILL PACKETS--------- /obj/item/storage/pill_bottle/packet name = "\improper pill packet" diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm index b9486e4f09..9a45b4256d 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm @@ -161,6 +161,9 @@ desc = "An ammunition case containing 20 M41A MK1 magazines." supplies = list(/obj/item/ammo_magazine/rifle/m41aMK1 = 20) +/obj/structure/largecrate/supply/ammo/m41amk1/forecon + supplies = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon = 20) + /obj/structure/largecrate/supply/ammo/m41a_box name = "\improper M41A ammunition box case (x4)" desc = "An ammunition case containing four M41A 600 round boxes of ammunition." diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 7b01243290..3461b9049e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -706,15 +706,15 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. var/new_slowdown = H.next_move_slowdown + rand(4,7) H.next_move_slowdown = new_slowdown if(prob(10)) - to_chat(H, SPAN_WARNING("It is very hard to move trough this [src]...")) + to_chat(H, SPAN_WARNING("It is very hard to move through this [src]...")) if(8 to 9) var/new_slowdown = H.next_move_slowdown + rand(8,11) H.next_move_slowdown = new_slowdown - to_chat(H, SPAN_WARNING("You got tangeled in [src]!")) + to_chat(H, SPAN_WARNING("You got tangled in [src]!")) if(10) var/new_slowdown = H.next_move_slowdown + rand(12,20) H.next_move_slowdown = new_slowdown - to_chat(H, SPAN_WARNING("You got completely tangeled in [src]! Oh boy...")) + to_chat(H, SPAN_WARNING("You got completely tangled in [src]! Oh boy...")) /obj/structure/flora/jungle/thickbush/attackby(obj/item/I as obj, mob/user as mob) //hatchets and shiet can clear away undergrowth @@ -724,9 +724,9 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. damage = rand(8,18) if(indestructable) //this bush marks the edge of the map, you can't destroy it - to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here.")) + to_chat(user, SPAN_DANGER("You chop at the undergrowth, but it's too thick here.")) else - user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I].")) + user.visible_message(SPAN_DANGER("[user] chops at the [src] with [I]."),SPAN_DANGER("You chop at the [src] with [I].")) playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1) health -= damage if(health < 0) diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm index 0a3e668444..099d8d4c20 100644 --- a/code/game/objects/structures/gun_rack.dm +++ b/code/game/objects/structures/gun_rack.dm @@ -84,3 +84,10 @@ max_stored = 2 initial_stored = 0 allowed_type = /obj/item/ammo_magazine/hardpoint/boyars_dualcannon + +/obj/structure/gun_rack/m41/recon + icon_state = "m41arecon" + populate_type = /obj/item/weapon/gun/rifle/m41aMK1/forecon + +/obj/structure/gun_rack/m41/recon/unloaded + populate_type = /obj/item/weapon/gun/rifle/m41aMK1/forecon/unloaded diff --git a/code/game/objects/structures/pipes/vents/vents.dm b/code/game/objects/structures/pipes/vents/vents.dm index 298fbc57f4..926f14cd2f 100644 --- a/code/game/objects/structures/pipes/vents/vents.dm +++ b/code/game/objects/structures/pipes/vents/vents.dm @@ -139,7 +139,7 @@ if(welded) to_chat(usr, SPAN_WARNING("You cannot release gas from a welded vent.")) return FALSE - var/list/options = list(VENT_GAS_SMOKE, VENT_GAS_CN20, VENT_GAS_CN20_XENO) + var/list/options = list(VENT_GAS_SMOKE, VENT_GAS_CN20, VENT_GAS_CN20_XENO, VENT_GAS_LSD) var/gas_choice = tgui_input_list(user, "What gas do you wish to use?", "Gas Choice", options, 20 SECONDS) if(!gas_choice) return FALSE @@ -166,6 +166,8 @@ spreader = new /datum/effect_system/smoke_spread/cn20 if(VENT_GAS_CN20_XENO) spreader = new /datum/effect_system/smoke_spread/cn20/xeno + if(VENT_GAS_LSD) + spreader = new /datum/effect_system/smoke_spread/LSD if(!spreader) return FALSE gas_holder = spreader diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index c7cee6b5c8..4a4af8fef3 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -658,6 +658,7 @@ health = 150 light_range = 6 light_on = TRUE + light_color = LIGHT_COLOUR_FIRE unslashable = TRUE /// What obj this becomes when it gets to its next stage of construction / ignition var/frame_type diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm index ab23a80867..4111bdfcdd 100644 --- a/code/game/objects/structures/vulture_spotter.dm +++ b/code/game/objects/structures/vulture_spotter.dm @@ -183,7 +183,10 @@ unscope() scope_attached = FALSE desc = initial(desc) + " Though, it doesn't seem to have one attached yet." - new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle) + if(skillless) + new /obj/item/device/vulture_spotter_scope/skillless(get_turf(src), bound_rifle) + else + new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle) /// Handler for user folding up the tripod, picking it up /obj/structure/vulture_spotter_tripod/proc/fold_up(mob/user) diff --git a/code/game/sound.dm b/code/game/sound.dm index 02be8dbace..f2574975a7 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -1,22 +1,44 @@ /datum/sound_template //Basically a sound datum, but only serves as a way to carry info to soundOutput - var/file //The sound itself - var/file_muffled // Muffled variant for those that are deaf - var/wait = 0 - var/repeat = 0 + //copied sound datum vars + ///This is the file that will be played when the sound is sent to a player. + var/file + ///Set to TRUE to repeat the sound indefinitely once it begins playing, 2 to repeat it forwards and backwards. + var/repeat = FALSE + ///Set to TRUE to wait for other sounds in this channel to finish before playing this one. + var/wait = FALSE + ///For sound effects, set to 1 through 1024 to choose a specific sound channel. For values of 0 or less, any available channel will be chosen. var/channel = 0 + ///Set to a percentage from 0 to 100 of the sound's full volume. var/volume = 100 - var/status = 0 //Sound status flags + ///Any value from -100 to 100 will play this sound at a multiple of its normal frequency. A value of 0 or 1 will play the sound at its normal frequency. var/frequency = 1 + ///Can be used to set a starting time, in seconds, for a sound. + var/offset = 0 + ///Can be used to shift the pitch of a sound up or down. This works similarly to frequency except that it doesn't impact playback speed. + var/pitch = 1 + ///Alter the way the sound is heard by affecting several different on/off values which combine as bit flags: SOUND_MUTE, SOUND_PAUSED, SOUND_STREAM, SOUND_UPDATE + var/status = NONE + ///Within the falloff distance a 3D sound stays at the constant loudest volume possible. Outside of this distance it attenuates at a rate determined by the falloff. var/falloff = 1 + ///Changes the environmental reverb for all 3D sounds until another environment is specified. The default value (-1) specifies no change in environment. A numeric value from 0 to 25 specifies a set of reverb presets for the environment. + var/environment = -1 + ///If set to an 18-element list, this value customizes reverbration settings for this sound only. + var/list/echo + + //custom vars + ///The category of this sound for client volume purposes: VOLUME_SFX (Sound effects), VOLUME_AMB (Ambience and Soundscapes) and VOLUME_ADM (Admin sounds and some other stuff) var/volume_cat = VOLUME_SFX + ///Maximum theoretical range (in tiles) of the sound, by default is equal to the volume. var/range = 0 - var/list/echo - var/x //Map coordinates, not sound coordinates + //Map coordinates, not sound coordinates, generated by the procs + var/x var/y var/z - var/y_s_offset // Vertical sound offset - var/x_s_offset // Horizontal sound offset + ///Horizontal sound position offset. + var/x_s_offset + ///Vertical sound position offset. + var/y_s_offset /proc/get_free_channel() var/static/cur_chan = 1 @@ -24,58 +46,73 @@ if(cur_chan > FREE_CHAN_END) cur_chan = 1 -//Proc used to play a sound effect. Avoid using this proc for non-IC sounds, as there are others -//source: self-explanatory. -//soundin: the .ogg to use. -//vol: the initial volume of the sound, 0 is no sound at all, 75 is loud queen screech. -//freq: the frequency of the sound. Setting it to 1 will assign it a random frequency -//sound_range: the maximum theoretical range (in tiles) of the sound, by default is equal to the volume. -//vol_cat: the category of this sound, used in client volume. There are 3 volume categories: VOLUME_SFX (Sound effects), VOLUME_AMB (Ambience and Soundscapes) and VOLUME_ADM (Admin sounds and some other stuff) -//channel: use this only when you want to force the sound to play on a specific channel -//status: the regular 4 sound flags -//falloff: max range till sound volume starts dropping as distance increases - -/proc/playsound(atom/source, soundin, vol = 100, vary = FALSE, sound_range, vol_cat = VOLUME_SFX, channel = 0, status , falloff = 1, echo, y_s_offset,x_s_offset) +/** + * Play a spatialized sound effect to everyone within hearing distance. + * + * Arguments: + * * source - origin atom for the sound + * * soundin - sound datum ( sound() ), sound file ('mysound.ogg'), or string to get a SFX ("male_warcry") + * * vol - the initial volume of the sound, 0 is no sound at all, 75 is loud queen screech. + * * vary - the frequency of the sound. Setting it to 1 will assign it a random frequency + * * sound_range - maximum theoretical range (in tiles) of the sound, by default is equal to the volume. + * * vol_cat - the category of this sound for client volume purposes: VOLUME_SFX (Sound effects), VOLUME_AMB (Ambience and Soundscapes), VOLUME_ADM (Admin sounds) + * * channel - use this only when you want to force the sound to play on a specific channel + * * status - combined bit flags: SOUND_MUTE, SOUND_PAUSED, SOUND_STREAM, SOUND_UPDATE + * * falloff - max range till sound volume starts dropping as distance increases + * * echo - customizes reverbration settings for this sound + * * y_s_offset - vertical sound position offset + * * x_s_offset - horizontal sound position offset + * + * Returns selected channel on success, FALSE on failure + */ +/proc/playsound(atom/source, sound/soundin, vol = 100, vary = FALSE, sound_range, vol_cat = VOLUME_SFX, channel = 0, status, falloff = 1, list/echo, y_s_offset, x_s_offset) if(isarea(source)) error("[source] is an area and is trying to make the sound: [soundin]") return FALSE - var/datum/sound_template/S = new() - - var/sound/SD = soundin - if(istype(SD)) - S.file = SD.file - S.wait = SD.wait - S.repeat = SD.repeat - else - S.file = get_sfx(soundin) - S.channel = channel ? channel : get_free_channel() - S.status = status - S.falloff = falloff - S.volume = vol - S.volume_cat = vol_cat - S.echo = echo - S.y_s_offset = y_s_offset - S.x_s_offset = x_s_offset - if(vary != FALSE) - if(vary > 1) - S.frequency = vary - else - S.frequency = GET_RANDOM_FREQ // Same frequency for everybody - - if(!sound_range) - sound_range = round(0.25*vol) //if no specific range, the max range is equal to a quarter of the volume. - S.range = sound_range var/turf/turf_source = get_turf(source) - if(!turf_source || !turf_source.z) + if(!turf_source?.z) return FALSE - S.x = turf_source.x - S.y = turf_source.y - S.z = turf_source.z + + var/datum/sound_template/template = new() + + if(istype(soundin)) + template.file = soundin.file + template.repeat = soundin.repeat + template.wait = soundin.wait + //template.channel = soundin.channel + //template.volume = soundin.volume + template.frequency = soundin.frequency + template.offset = soundin.offset + template.pitch = soundin.pitch + //template.status = soundin.status + //template.falloff = soundin.falloff + //template.environment = soundin.environment + //template.echo = soundin.echo + else + template.file = get_sfx(soundin) + + template.channel = channel || get_free_channel() + template.volume = vol + if(vary > 1) + template.frequency = vary + else if(vary) + template.frequency = GET_RANDOM_FREQ // Same frequency for everybody + template.status = status + template.falloff = falloff + template.echo = echo + + template.volume_cat = vol_cat + template.range = sound_range || floor(0.25 * vol) //if no specific range, the max range is equal to a quarter of the volume. + template.x = turf_source.x + template.y = turf_source.y + template.z = turf_source.z + template.x_s_offset = x_s_offset + template.y_s_offset = y_s_offset if(!SSinterior) - SSsound.queue(S) - return S.channel + SSsound.queue(template) + return template.channel var/list/datum/interior/extra_interiors = list() // If we're in an interior, range the chunk, then adjust to do so from outside instead @@ -85,66 +122,127 @@ extra_interiors |= VI if(VI.exterior) var/turf/new_turf_source = get_turf(VI.exterior) - S.x = new_turf_source.x - S.y = new_turf_source.y - S.z = new_turf_source.z - else sound_range = 0 + template.x = new_turf_source.x + template.y = new_turf_source.y + template.z = new_turf_source.z // Range for 'nearby interiors' aswell for(var/datum/interior/VI in SSinterior.interiors) if(VI?.ready && VI.exterior?.z == turf_source.z && get_dist(VI.exterior, turf_source) <= sound_range) extra_interiors |= VI - SSsound.queue(S, null, extra_interiors) - return S.channel + SSsound.queue(template, null, extra_interiors) + return template.channel -//This is the replacement for playsound_local. Use this for sending sounds directly to a client -/proc/playsound_client(client/C, soundin, atom/origin, vol = 100, random_freq, vol_cat = VOLUME_SFX, channel = 0, status, list/echo, y_s_offset, x_s_offset) +/** + * Play a sound effect directly to a client. + * + * Arguments: + * * C - client to hear the sound + * * soundin - sound datum ( sound() ), sound file ('mysound.ogg'), or string to get a SFX ("male_warcry") + * * origin - origin atom for the sound + * * vol - the initial volume of the sound, 0 is no sound at all, 75 is loud queen screech. + * * random_freq - assign the sound a random frequency + * * vol_cat - the category of this sound for client volume purposes: VOLUME_SFX (Sound effects), VOLUME_AMB (Ambience and Soundscapes), VOLUME_ADM (Admin sounds) + * * channel - use this only when you want to force the sound to play on a specific channel + * * status - combined bit flags: SOUND_MUTE, SOUND_PAUSED, SOUND_STREAM, SOUND_UPDATE + * * echo - customizes reverbration settings for this sound + * * y_s_offset - vertical sound position offset + * * x_s_offset - horizontal sound position offset + * + * Returns FALSE on failure + */ +/proc/playsound_client(client/C, sound/soundin, atom/origin, vol = 100, random_freq, vol_cat = VOLUME_SFX, channel = 0, status, list/echo, y_s_offset, x_s_offset) if(!istype(C) || !C.soundOutput) return FALSE - var/datum/sound_template/S = new() - if(origin) - var/turf/T = get_turf(origin) - if(T) - S.x = T.x - S.y = T.y - S.z = T.z - var/sound/SD = soundin - if(istype(SD)) - S.file = SD.file - S.wait = SD.wait - S.repeat = SD.repeat + + var/datum/sound_template/template = new() + + if(istype(soundin)) + template.file = soundin.file + template.repeat = soundin.repeat + template.wait = soundin.wait + //template.channel = soundin.channel + //template.volume = soundin.volume + template.frequency = soundin.frequency + template.offset = soundin.offset + template.pitch = soundin.pitch + //template.status = soundin.status + //template.falloff = soundin.falloff + //template.environment = soundin.environment + //template.echo = soundin.echo else - S.file = get_sfx(soundin) + template.file = get_sfx(soundin) + template.channel = channel + template.volume = vol if(random_freq) - S.frequency = GET_RANDOM_FREQ - S.volume = vol - S.volume_cat = vol_cat - S.channel = channel - S.status = status - S.echo = echo - S.y_s_offset = y_s_offset - S.x_s_offset = x_s_offset - SSsound.queue(S, list(C)) - -/// Plays sound to all mobs that are map-level contents of an area -/proc/playsound_area(area/A, soundin, vol = 100, channel = 0, status, vol_cat = VOLUME_SFX, list/echo, y_s_offset, x_s_offset) + template.frequency = GET_RANDOM_FREQ + template.status = status + template.echo = echo + + template.volume_cat = vol_cat + var/turf/turf_origin = get_turf(origin) + if(turf_origin) + template.x = turf_origin.x + template.y = turf_origin.y + template.z = turf_origin.z + template.x_s_offset = x_s_offset + template.y_s_offset = y_s_offset + + SSsound.queue(template, list(C)) + +/** + * Play a sound effect to all mobs that are map-level contents of an area. + * + * Arguments: + * * A - affected area to hear the sound + * * soundin - sound datum ( sound() ), sound file ('mysound.ogg'), or string to get a SFX ("male_warcry") + * * vol - the initial volume of the sound, 0 is no sound at all, 75 is loud queen screech. + * * channel - use this only when you want to force the sound to play on a specific channel + * * status - combined bit flags: SOUND_MUTE, SOUND_PAUSED, SOUND_STREAM, SOUND_UPDATE + * * vol_cat - the category of this sound for client volume purposes: VOLUME_SFX (Sound effects), VOLUME_AMB (Ambience and Soundscapes), VOLUME_ADM (Admin sounds) + * * echo - customizes reverbration settings for this sound + * + * Returns FALSE on failure + */ +/proc/playsound_area(area/A, sound/soundin, vol = 100, channel = 0, status, vol_cat = VOLUME_SFX, list/echo, y_s_offset, x_s_offset) if(!isarea(A)) return FALSE - var/datum/sound_template/S = new() - S.file = soundin - S.volume = vol - S.channel = channel - S.status = status - S.volume_cat = vol_cat + + var/datum/sound_template/template = new() + + if(istype(soundin)) + template.file = soundin.file + template.repeat = soundin.repeat + template.wait = soundin.wait + //template.channel = soundin.channel + //template.volume = soundin.volume + template.frequency = soundin.frequency + template.offset = soundin.offset + template.pitch = soundin.pitch + //template.status = soundin.status + //template.falloff = soundin.falloff + //template.environment = soundin.environment + //template.echo = soundin.echo + else + template.file = get_sfx(soundin) + + template.channel = channel + template.volume = vol + template.status = status + + template.volume_cat = vol_cat + template.x_s_offset = x_s_offset + template.y_s_offset = y_s_offset var/list/hearers = list() - for(var/mob/living/M in A.contents) - if(!M || !M.client || !M.client.soundOutput) + for(var/mob/living/living_mob in A.contents) + if(!living_mob || !living_mob.client || !living_mob.client.soundOutput) continue - hearers += M.client - SSsound.queue(S, hearers) + hearers += living_mob.client + + SSsound.queue(template, hearers) /client/proc/playtitlemusic() if(!SSticker?.login_music) @@ -153,21 +251,53 @@ playsound_client(src, SSticker.login_music, null, 70, 0, VOLUME_LOBBY, SOUND_CHANNEL_LOBBY, SOUND_STREAM) -/// Play sound for all on-map clients on a given Z-level. Good for ambient sounds. -/proc/playsound_z(z, soundin, volume = 100, vol_cat = VOLUME_SFX, echo, y_s_offset, x_s_offset) - var/datum/sound_template/S = new() - S.file = soundin - S.volume = volume - S.channel = SOUND_CHANNEL_Z - S.volume_cat = vol_cat - S.echo = echo - S.y_s_offset = y_s_offset - S.x_s_offset = x_s_offset +/** + * Play a sound effect for all on-map clients on a given Z-level. + * + * Arguments: + * * z - list of affected [/datum/space_level] to hear the sound + * * soundin - sound datum ( sound() ), sound file ('mysound.ogg'), or string to get a SFX ("male_warcry") + * * volume - the initial volume of the sound, 0 is no sound at all, 75 is loud queen screech. + * * vol_cat - the category of this sound for client volume purposes: VOLUME_SFX (Sound effects), VOLUME_AMB (Ambience and Soundscapes), VOLUME_ADM (Admin sounds) + * * echo - customizes reverbration settings for this sound + * * y_s_offset - vertical sound position offset + * * x_s_offset - horizontal sound position offset + * + * Returns selected channel on success, FALSE on failure + */ +/proc/playsound_z(list/z, sound/soundin, volume = 100, vol_cat = VOLUME_SFX, echo, y_s_offset, x_s_offset) + var/datum/sound_template/template = new() + + if(istype(soundin)) + template.file = soundin.file + template.repeat = soundin.repeat + template.wait = soundin.wait + //template.channel = soundin.channel + //template.volume = soundin.volume + template.frequency = soundin.frequency + template.offset = soundin.offset + template.pitch = soundin.pitch + //template.status = soundin.status + //template.falloff = soundin.falloff + //template.environment = soundin.environment + //template.echo = soundin.echo + else + template.file = get_sfx(soundin) + + template.channel = SOUND_CHANNEL_Z + template.volume = volume + template.echo = echo + + template.volume_cat = vol_cat + template.x_s_offset = x_s_offset + template.y_s_offset = y_s_offset + var/list/hearers = list() - for(var/mob/M in GLOB.player_list) - if((M.z in z) && M.client.soundOutput) - hearers += M.client - SSsound.queue(S, hearers) + for(var/mob/mob in GLOB.player_list) + if((mob.z in z) && mob.client.soundOutput) + hearers += mob.client + + SSsound.queue(template, hearers) // The pick() proc has a built-in chance that can be added to any option by adding ,X; to the end of an option, where X is the % chance it will play. /proc/get_sfx(S) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 34cc3ee3c8..6e47391fc1 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -330,6 +330,8 @@ var/list/roundstart_mod_verbs = list( if(CLIENT_HAS_RIGHTS(src, R_BUILDMODE)) add_verb(src, /client/proc/togglebuildmodeself) add_verb(src, /client/proc/toggle_game_master) + add_verb(src, /client/proc/open_resin_panel) + add_verb(src, /client/proc/open_sound_panel) add_verb(src, /client/proc/toggle_join_xeno) add_verb(src, /client/proc/game_master_rename_platoon) add_verb(src, /client/proc/toggle_vehicle_blockers) @@ -364,6 +366,8 @@ var/list/roundstart_mod_verbs = list( admin_verbs_default, /client/proc/togglebuildmodeself, /client/proc/toggle_game_master, + /client/proc/open_resin_panel, + /client/proc/open_sound_panel, /client/proc/toggle_join_xeno, /client/proc/game_master_rename_platoon, /client/proc/toggle_vehicle_blockers, diff --git a/code/modules/admin/game_master/extra_buttons/rename_platoon.dm b/code/modules/admin/game_master/extra_buttons/rename_platoon.dm index 9d805ab9d1..575319ad73 100644 --- a/code/modules/admin/game_master/extra_buttons/rename_platoon.dm +++ b/code/modules/admin/game_master/extra_buttons/rename_platoon.dm @@ -28,8 +28,8 @@ GLOBAL_VAR_INIT(main_platoon_initial_name, GLOB.main_platoon_name) if(!new_name || !istext(new_name)) return - if(length(new_name) > 10) - to_chat(src, SPAN_NOTICE("The platoon name should be 10 characters or less.")) + if(length(new_name) > 16) + to_chat(src, SPAN_NOTICE("The platoon name should be 16 characters or less.")) return var/old_name = GLOB.main_platoon_name diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm index 947c49aeb5..2745287727 100644 --- a/code/modules/admin/game_master/game_master.dm +++ b/code/modules/admin/game_master/game_master.dm @@ -158,7 +158,8 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100) data["game_master_objectives"] = length(GLOB.game_master_objectives) ? GLOB.game_master_objectives : "" // Communication stuff - data["communication_clarity"] = GLOB.radio_communication_clarity + data["radio_clarity"] = GLOB.radio_communication_clarity + data["radio_clarity_example"] = stars("The quick brown fox jumped over the lazy dog.", GLOB.radio_communication_clarity) return data @@ -294,7 +295,7 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100) if("use_game_master_phone") game_master_phone.attack_hand(ui.user) - if("set_communication_clarity") + if("set_radio_clarity") var/new_clarity = text2num(params["clarity"]) if(!isnum(new_clarity)) return diff --git a/code/modules/admin/game_master/resin_panel.dm b/code/modules/admin/game_master/resin_panel.dm new file mode 100644 index 0000000000..bab4097173 --- /dev/null +++ b/code/modules/admin/game_master/resin_panel.dm @@ -0,0 +1,177 @@ +#define RESIN_PANEL_STRUCTURES \ +list( \ + /datum/resin_construction/resin_turf/wall, \ + /datum/resin_construction/resin_turf/wall/thick, \ + /datum/resin_construction/resin_turf/wall/reflective, \ + /datum/resin_construction/resin_turf/membrane, \ + /datum/resin_construction/resin_turf/membrane/thick, \ + /datum/resin_construction/resin_obj/door, \ + /datum/resin_construction/resin_obj/door/thick, \ + /datum/resin_construction/resin_obj/resin_node, \ + /datum/resin_construction/resin_obj/sticky_resin, \ + /datum/resin_construction/resin_obj/fast_resin, \ + /datum/resin_construction/resin_obj/resin_spike, \ + /datum/resin_construction/resin_obj/acid_pillar, \ + /turf/closed/wall/mineral/bone_resin \ +) + +/client/proc/open_resin_panel() + set name = "Resin Panel" + set category = "Game Master" + + if(!check_rights(R_ADMIN)) + return + + new /datum/resin_panel(usr) + +/datum/resin_panel + var/static/list/structure_list + var/static/list/removal_allowlist + var/selected_structure + var/selected_hive = XENO_HIVE_NORMAL + var/client/holder + var/build_click_intercept = FALSE + +/datum/resin_panel/New(user) + if(isnull(structure_list)) //first run, init statics + structure_list = get_structures() + + removal_allowlist = list() + for(var/structure as anything in RESIN_PANEL_STRUCTURES) + if(structure in GLOB.resin_constructions_list) + var/datum/resin_construction/construct = structure + removal_allowlist += construct.build_path + else + removal_allowlist += structure + + if(isclient(user)) + holder = user + else + var/mob/mob = user + holder = mob.client + + holder.click_intercept = src + tgui_interact(holder.mob) + +/datum/resin_panel/proc/get_structures() + var/list/structures = list() + for(var/structure as anything in RESIN_PANEL_STRUCTURES) + var/list/entry = list() + + if(structure in GLOB.resin_constructions_list) + var/datum/resin_construction/construct = structure + entry["name"] = construct.name + entry["image"] = replacetext(construct.construction_name, " ", "-") + entry["id"] = "[construct]" + else if(structure in typesof(/turf)) + var/turf/turf = structure + entry["name"] = turf.name + switch(turf) + if(/turf/closed/wall/mineral/bone_resin) + entry["image"] = "reflective-resin-wall" //looks just like it, saves on making new spritesheet for one image + else + entry["image"] = turf.icon_state + entry["id"] = "[turf]" + + structures += list(entry) + + return structures + +/datum/resin_panel/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/spritesheet/choose_resin), + ) + +/datum/resin_panel/ui_static_data(mob/user) + var/list/data = list() + + data["structure_list"] = structure_list + data["hives_list"] = ALL_XENO_HIVES + + return data + +/datum/resin_panel/ui_data(mob/user) + var/list/data = list() + + data["selected_structure"] = selected_structure + data["selected_hive"] = selected_hive + data["build_click_intercept"] = build_click_intercept + + return data + +/datum/resin_panel/ui_close(mob/user) + holder = null + build_click_intercept = FALSE + qdel(src) + +/datum/resin_panel/ui_state(mob/user) + return GLOB.admin_state + +/datum/resin_panel/ui_status(mob/user, datum/ui_state/state) + return UI_INTERACTIVE + +/datum/resin_panel/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ResinPanel", "Resin Panel") + ui.set_autoupdate(FALSE) + ui.open() + +/datum/resin_panel/proc/InterceptClickOn(mob/user, params, atom/object) + if(!build_click_intercept) + return + + var/list/modifiers = params2list(params) + + if(LAZYACCESS(modifiers, MIDDLE_CLICK)) //remove + if(!(object.type in removal_allowlist)) + return + + if(isturf(object)) + var/turf/turf = object + turf.ScrapeAway() + else + qdel(object) + else //add + if(!selected_structure) + return + + var/turf/current_turf = get_turf(object) + + var/atom/new_structure + if(selected_structure in GLOB.resin_constructions_list) + var/datum/resin_construction/construct = GLOB.resin_constructions_list[selected_structure] + new_structure = construct.build(current_turf, selected_hive) + else if(selected_structure in typesof(/turf)) + var/turf/turf = selected_structure + new_structure = current_turf.PlaceOnTop(turf) + new_structure?.add_hiddenprint(user) //so admins know who placed it + + return TRUE + +/datum/resin_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + if(!check_rights(R_ADMIN)) + return + + switch(action) + if("set_selected_structure") + var/selected_type = text2path(params["type"]) + if(!(selected_type in RESIN_PANEL_STRUCTURES)) + return + selected_structure = selected_type + return TRUE + if("set_selected_hive") + var/hive = params["selected_hive"] + if(!(hive in ALL_XENO_HIVES)) + return + selected_hive = hive + return TRUE + if("toggle_build_click_intercept") + build_click_intercept = !build_click_intercept + return TRUE + +#undef RESIN_PANEL_STRUCTURES diff --git a/code/modules/admin/game_master/sound_panel.dm b/code/modules/admin/game_master/sound_panel.dm new file mode 100644 index 0000000000..8aff8b0f23 --- /dev/null +++ b/code/modules/admin/game_master/sound_panel.dm @@ -0,0 +1,272 @@ +/client/proc/open_sound_panel() + set name = "Sound Panel" + set category = "Admin.Panels" + + if(!check_rights(R_SOUNDS)) + return + + new /datum/sound_panel(usr) + +/datum/sound_panel + var/static/list/sound_list + var/static/list/category_list + var/static/list/category_lookup + var/static/list/zlevel_list + var/static/list/zlevel_lookup + var/static/list/group_list + var/client/holder + var/sound_path = "" + var/sound_category + var/sound_volume = 50 + var/sound_pitch = 1 + var/sound_duration = 1 + var/mob/target_player + var/turf/target_loc + var/loc_click_intercept = FALSE + var/loc_click_play = FALSE + var/target_zlevel + var/target_group + +/datum/sound_panel/New(user) + if(isnull(sound_list)) //first run, init statics + sound_list = get_sounds() + + category_list = list("Sound FX", "Ambience", "Admin") + category_lookup = list("Sound FX" = VOLUME_SFX, "Ambience" = VOLUME_AMB, "Admin" = VOLUME_ADM) + + zlevel_list = list() + zlevel_lookup = list() + for(var/datum/space_level/level as anything in SSmapping.z_list) + zlevel_list += level.name + zlevel_lookup[level.name] = level.z_value + + group_list = list("Global", "Humans", "Xenos", "Ghosts") + + sound_category = category_list[1] + target_zlevel = zlevel_list[1] + target_group = group_list[1] + + if(isclient(user)) + holder = user + else + var/mob/mob = user + holder = mob.client + + holder.click_intercept = src + tgui_interact(holder.mob) + +/datum/sound_panel/proc/get_sounds() + var/static/list/extensions = list("mid", "midi", "mod", "it", "s3m", "xm", "oxm", "wav", "ogg", "mp3", "raw", "wma", "aiff") + var/static/regex/ext_rgx = new("\\.(?:[jointext(extensions, "|")])$", "i") + + var/list/dirs = list("sound/") + var/list/file_paths = list() + for(var/i = 1, i <= length(dirs), i++) + var/path = dirs[i] + + var/list/filenames = flist(path) + for(var/filename as anything in filenames) + if(findtext(filename, "/", -1)) //found directory, add to search + dirs += "[path][filename]" + continue + if(!findtext(filename, ext_rgx)) //extension check + continue + file_paths += "[path][filename]" + + return file_paths + +/datum/sound_panel/ui_static_data(mob/user) + var/list/data = list() + + data["sound_list"] = sound_list + data["category_list"] = category_list + data["zlevel_list"] = zlevel_list + data["group_list"] = group_list + + return data + +/datum/sound_panel/ui_data(mob/user) + var/list/data = list() + + data["sound_path"] = sound_path + data["sound_category"] = sound_category + data["sound_volume"] = sound_volume + data["sound_pitch"] = sound_pitch + data["sound_duration"] = sound_duration + data["target_player_desc"] = target_player?.name + data["target_loc_desc"] = target_loc ? "[target_loc.name]: [target_loc.x],[target_loc.y],[target_loc.z]" : null + data["loc_click_intercept"] = loc_click_intercept + data["loc_click_play"] = loc_click_play + data["target_zlevel"] = target_zlevel + data["target_group"] = target_group + + return data + +/datum/sound_panel/ui_close(mob/user) + holder = null + target_loc = null + target_player = null + loc_click_intercept = FALSE + qdel(src) + +/datum/sound_panel/ui_state(mob/user) + return GLOB.admin_state + +/datum/sound_panel/ui_status(mob/user, datum/ui_state/state) + return UI_INTERACTIVE + +/datum/sound_panel/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "SoundPanel", "Sound Panel") + ui.set_autoupdate(FALSE) + ui.open() + +/datum/sound_panel/proc/InterceptClickOn(mob/user, params, atom/object) + if(loc_click_intercept) + var/turf/chosen_loc = get_turf(object) + if(QDELETED(chosen_loc)) + return + + target_loc = chosen_loc + SStgui.update_uis(src) + + if(loc_click_play) + if(!sound_path) + return + + var/sound/sound_datum = sound(sound_path) + sound_datum.frequency = 1 / sound_duration + sound_datum.pitch = sound_pitch * sound_duration + + playsound(target_loc, sound_datum, sound_volume, vol_cat = category_lookup[sound_category]) + + return TRUE + +/datum/sound_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + if(!check_rights(R_SOUNDS)) + return + + switch(action) + if("set_sound_path") + var/sound = params["sound_path"] + if(!(sound in sound_list)) + return + sound_path = sound + return TRUE + if("set_sound_category") + var/category = params["sound_category"] + if(isnull(category_lookup[category])) + return + sound_category = category + return TRUE + if("set_sound_volume") + sound_volume = clamp(params["sound_volume"], 0, 100) + return TRUE + if("set_sound_pitch") + sound_pitch = clamp(params["sound_pitch"], 0.5, 2) + return TRUE + if("set_sound_duration") + sound_duration = clamp(params["sound_duration"], 0.5, 2) + return TRUE + if("set_target_zlevel") + var/target_z = params["target_zlevel"] + if(isnull(zlevel_lookup[target_z])) + return + target_zlevel = target_z + return TRUE + if("set_target_group") + var/group = params["target_group"] + if(!(group in group_list)) + return + target_group = group + return TRUE + if("play_preview") + if(!sound_path) + return + + var/sound/sound_datum = sound(sound_path) + sound_datum.frequency = 1 / sound_duration + sound_datum.pitch = sound_pitch * sound_duration + + playsound_client(holder, sound_datum, vol = sound_volume, vol_cat = category_lookup[sound_category], channel = SOUND_CHANNEL_TEST) + return TRUE + if("stop_preview") + var/sound/sound_datum = sound() + sound_datum.channel = SOUND_CHANNEL_TEST + sound_datum.status = SOUND_MUTE|SOUND_UPDATE + sound_to(holder, sound_datum) + return TRUE + if("select_client") + var/mob/chosen_player = tgui_input_list(holder.mob, "Who should hear the sound?", "Player Select", GLOB.player_list) + if(QDELETED(chosen_player)) + return + + target_player = chosen_player + return TRUE + if("play_client") + if(!sound_path) + return + if(QDELETED(target_player)) + return + + var/sound/sound_datum = sound(sound_path) + sound_datum.frequency = 1 / sound_duration + sound_datum.pitch = sound_pitch * sound_duration + + playsound_client(target_player.client, sound_datum, vol = sound_volume, vol_cat = category_lookup[sound_category]) + return TRUE + if("toggle_loc_click_intercept") + loc_click_intercept = !loc_click_intercept + return TRUE + if("toggle_loc_click_play") + loc_click_play = !loc_click_play + return TRUE + if("play_local") + if(!sound_path) + return + if(QDELETED(target_loc)) + return + + var/sound/sound_datum = sound(sound_path) + sound_datum.frequency = 1 / sound_duration + sound_datum.pitch = sound_pitch * sound_duration + + playsound(target_loc, sound_datum, sound_volume, vol_cat = category_lookup[sound_category]) + return TRUE + if("play_zlevel") + if(!sound_path) + return + + var/sound/sound_datum = sound(sound_path) + sound_datum.frequency = 1 / sound_duration + sound_datum.pitch = sound_pitch * sound_duration + + playsound_z(list(zlevel_lookup[target_zlevel]), sound_datum, sound_volume, vol_cat = category_lookup[sound_category]) + return TRUE + if("play_group") + if(!sound_path) + return + + var/sound/sound_datum = sound(sound_path) + sound_datum.frequency = 1 / sound_duration + sound_datum.pitch = sound_pitch * sound_duration + + var/list/targets = list() + switch(target_group) + if("Global") + targets = GLOB.mob_list + if("Humans") + targets = GLOB.human_mob_list + GLOB.dead_mob_list + if("Xenos") + targets = GLOB.xeno_mob_list + GLOB.dead_mob_list + if("Ghosts") + targets = GLOB.observer_list + GLOB.dead_mob_list + + for(var/mob/target as anything in targets) + playsound_client(target.client, sound_datum, vol = sound_volume, vol_cat = category_lookup[sound_category]) + return TRUE diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 05da6d3c86..7f0d61d671 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -113,12 +113,13 @@ Here's a slightly more formal quick reference. - The 4 queries you can do are: + The 5 queries you can do are: "SELECT " "CALL ON " "UPDATE SET var=,var2=" "DELETE " + "SINGLECALL ." "" in this context is " [IN ] [chain of MAP/WHERE modifiers]" @@ -155,11 +156,13 @@ Add USING keyword to the front of the query to use options system The defaults aren't necessarily implemented, as there is no need to. Available options: (D) means default - PROCCALL = (D)ASYNC, BLOCKING - SELECT = FORCE_NULLS, (D)SKIP_NULLS + PROCCALL = (D) ASYNC, BLOCKING + SELECT = FORCE_NULLS, (D) SKIP_NULLS PRIORITY = HIGH, (D) NORMAL AUTOGC = (D) AUTOGC, KEEP_ALIVE SEQUENTIAL = TRUE - The queries in this batch will be executed sequentially one by one not in parallel + LISTSOURCE = OPTIMIZED, (D) UNOPTIMIZED + SELECTPRINT = (D) OUTPUT_POPUP, NO_OUTPUT_POPUP Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT /mob FROM world WHERE z == 1 @@ -174,21 +177,31 @@ #define SDQL2_STATE_SWITCHING 5 #define SDQL2_STATE_HALTING 6 -#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc" , "sequential") -#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive" , "true") +#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc" , "sequential", "listsource", "selectprint") +#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive" , "true", "optimized", "no_output") +/// Don't print nulls that the select picked up. Enabled by default #define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS (1<<0) +/// Require proccalls to finish before continuing the query #define SDQL2_OPTION_BLOCKING_CALLS (1<<1) -#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) //High priority SDQL query, allow using almost all of the tick. +/// High priority SDQL query, allow using almost all of the tick. +#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) +/// Do not delete the query after its completion #define SDQL2_OPTION_DO_NOT_AUTOGC (1<<3) +/// Queries chained together with ; will execute in series instead of in parallel #define SDQL2_OPTION_SEQUENTIAL (1<<4) +/// Change to GLOB.mob_list for /mob or etc. automatically if we're iterating over world. +/// This isn't default because SDQL2 is a technical tool that should be as failure-safe as possible (such as a mob not being added to GLOB.mob_list, for example) +#define SDQL2_OPTION_OPTIMIZED_SOURCE (1<<5) +/// When using SELECT, don't print a popup. Makes SELECT vastly faster. +#define SDQL2_OPTION_NO_OUTPUT_POPUP (1<<6) #define SDQL2_OPTIONS_DEFAULT (SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS) #define SDQL2_IS_RUNNING (state == SDQL2_STATE_EXECUTING || state == SDQL2_STATE_SEARCHING || state == SDQL2_STATE_SWITCHING || state == SDQL2_STATE_PRESEARCH) #define SDQL2_HALT_CHECK if(!SDQL2_IS_RUNNING) {state = SDQL2_STATE_HALTING; return FALSE;}; -#define SDQL2_TICK_CHECK ((options & SDQL2_OPTION_HIGH_PRIORITY)? CHECK_TICK_HIGH_PRIORITY : CHECK_TICK) +#define SDQL2_TICK_CHECK ((options & SDQL2_OPTION_HIGH_PRIORITY) ? CHECK_TICK_HIGH_PRIORITY : CHECK_TICK) #define SDQL2_STAGE_SWITCH_CHECK if(state != SDQL2_STATE_SWITCHING){\ if(state == SDQL2_STATE_HALTING){\ @@ -206,12 +219,12 @@ var/prompt = tgui_alert(usr, "Run SDQL2 Query?", "SDQL2", list("Yes", "Cancel")) if (prompt != "Yes") return - var/list/results = world.SDQL2_query(query_text, key_name_admin(usr), "[key_name(usr)]") + var/list/results = world.SDQL2_query(query_text, key_name_admin(usr), "[key_name(usr)]", executor = src) if(length(results) == 3) for(var/I in 1 to 3) to_chat(usr, results[I], confidential = TRUE) -/world/proc/SDQL2_query(query_text, log_entry1, log_entry2, silent = FALSE) +/world/proc/SDQL2_query(query_text, log_entry1, log_entry2, silent = FALSE, client/executor) var/query_log = "executed SDQL query(s): \"[query_text]\"." if(!silent) message_admins("[log_entry1] [query_log]") @@ -243,6 +256,8 @@ if(query.options & SDQL2_OPTION_SEQUENTIAL) sequential = TRUE + SSstatpanels.set_SDQL2_tab(executor) + if(sequential) //Start first one var/datum/sdql2_query/query = popleft(waiting_queue) running += query @@ -492,6 +507,14 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null switch(value) if("true") options |= SDQL2_OPTION_SEQUENTIAL + if("listsource") + switch(value) + if("optimized") + options |= SDQL2_OPTION_OPTIMIZED_SOURCE + if("selectprint") + switch(value) + if("no_output") + options |= SDQL2_OPTION_NO_OUTPUT_POPUP /datum/sdql2_query/proc/ARun() INVOKE_ASYNC(src, PROC_REF(Run)) @@ -515,7 +538,11 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null SDQL2_STAGE_SWITCH_CHECK state = SDQL2_STATE_SEARCHING - var/list/found = Search(search_tree) + var/list/found = list() + if(length(search_tree)) + found = Search(search_tree) + else + state = SDQL2_STATE_SWITCHING SDQL2_STAGE_SWITCH_CHECK state = SDQL2_STATE_EXECUTING @@ -532,7 +559,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null var/mob/showmob = C.mob to_chat(showmob, "SDQL query results: [get_query_text()]
    \ SDQL query completed: [islist(obj_count_all)? length(obj_count_all) : obj_count_all] objects selected by path, and \ - [where_switched? "[islist(obj_count_eligible)? length(obj_count_eligible) : obj_count_eligible] objects executed on after WHERE keyword selection." : ""]
    \ + [where_switched? "[islist(obj_count_eligible)? length(obj_count_eligible) : obj_count_eligible] objects executed on after WHERE keyword selection." : "no execution performed."]
    \ SDQL query took [DisplayTimeText(end_time - start_time)] to complete.    ", confidential = TRUE) if(length(select_text)) var/text = islist(select_text)? select_text.Join() : select_text @@ -627,8 +654,45 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null type = text2path(type) var/typecache = typecacheof(type) - if(ispath(type, /mob)) - for(var/mob/d in location) + if(ispath(type, /mob/living/carbon/human)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.human_mob_list + + for(var/mob/living/carbon/human/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /mob/living/carbon/xenomorph)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.xeno_mob_list + + for(var/mob/living/carbon/xenomorph/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /mob/living)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.living_mob_list + + for(var/mob/living/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /mob)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.mob_list + + for(var/mob/d in search_location) if(typecache[d.type] && (d.can_vv_get() || superuser)) out += d SDQL2_TICK_CHECK @@ -641,6 +705,61 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null SDQL2_TICK_CHECK SDQL2_HALT_CHECK + else if(ispath(type, /obj/item/weapon/gun)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.gun_list + + for(var/obj/item/weapon/gun/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /obj/item/ammo_magazine)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.ammo_magazine_list + + for(var/obj/item/ammo_magazine/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /obj/vehicle/multitile)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.all_multi_vehicles + + for(var/obj/item/ammo_magazine/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /obj/structure/closet)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.closet_list + + for(var/obj/item/ammo_magazine/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + + else if(ispath(type, /obj/structure/cable)) + var/list/search_location = location + if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) + search_location = GLOB.cable_list + + for(var/obj/item/ammo_magazine/d in search_location) + if(typecache[d.type] && (d.can_vv_get() || superuser)) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + else if(ispath(type, /obj)) for(var/obj/d in location) if(typecache[d.type] && (d.can_vv_get() || superuser)) @@ -662,6 +781,17 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null SDQL2_TICK_CHECK SDQL2_HALT_CHECK + else if(ispath(type, /client)) + var/list/search_location = location + if(location == world) // clients aren't picked up by an in world loop + search_location = GLOB.clients + + for(var/client/d in search_location) + if(d.can_vv_get() || superuser) + out += d + SDQL2_TICK_CHECK + SDQL2_HALT_CHECK + else if(ispath(type, /datum)) if(location == world) //snowflake for byond shortcut for(var/datum/d) //stupid byond trick to have it not return atoms to make this less laggy @@ -692,6 +822,10 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null SDQL2_TICK_CHECK SDQL2_HALT_CHECK + if("singlecall") + world.SDQL_var(null, query_tree["singlecall"][1], null, null, superuser, src) + obj_count_finished++ + if("delete") for(var/datum/d in found) qdel(d) @@ -704,7 +838,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null var/print_nulls = !(options & SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS) obj_count_finished = select_refs for(var/i in found) - SDQL_print(i, text_list, print_nulls) + if(!(options & SDQL2_OPTION_NO_OUTPUT_POPUP)) + SDQL_print(i, text_list, print_nulls) select_refs[REF(i)] = TRUE SDQL2_TICK_CHECK SDQL2_HALT_CHECK @@ -757,7 +892,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null SDQL_print(x, text_list) if (!isnull(x) && !isnum(x) && obj_list[x] != null) text_list += " -> " - SDQL_print(obj_list[obj_list[x]]) + SDQL_print(obj_list[x]) text_list += "]
    " else if(isnull(object)) @@ -1046,42 +1181,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null else if(D != null && long && expression[start + 1] == ":" && hascall(D, expression[start])) v = expression[start] else if(!long || expression[start + 1] == ".") - switch(expression[start]) - if("usr") - v = usr - if("src") - v = source - if("marked") - if(usr?.client?.admin_holder?.marked_datum) - v = usr?.client?.admin_holder?.marked_datum - else - return null - if("world") - v = world - if("global") - v = GLOB - if("MC") - v = Master - if("FS") - v = Failsafe - if("CFG") - v = config - else - if(copytext(expression[start], 1, 3) == "SS") //Subsystem //3 == length("SS") + 1 - var/SSname = copytext_char(expression[start], 3) - var/SSlength = length(SSname) - var/datum/controller/subsystem/SS - var/SSmatch - for(var/_SS in Master.subsystems) - SS = _SS - if(copytext("[SS.type]", -SSlength) == SSname) - SSmatch = SS - break - if(!SSmatch) - return null - v = SSmatch - else - return null + v = SDQL2_special_obj_from_string(expression[start], source) else if(object == GLOB) // Shitty ass hack kill me. v = expression[start] if(long) @@ -1206,8 +1306,45 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null query_list += word return query_list +/proc/SDQL2_special_obj_from_string(input_text, datum/source) + switch(input_text) + if("usr") + return usr + if("src") + return source + if("marked") + if(usr?.client?.admin_holder?.marked_datum) + return usr?.client?.admin_holder?.marked_datum + else + return null + if("world") + return world + if("global") + return GLOB + if("MC") + return Master + if("FS") + return Failsafe + if("CFG") + return config + else + if(copytext(input_text, 1, 3) == "SS") //Subsystem //3 == length("SS") + 1 + var/SSname = copytext_char(input_text, 3) + var/SSlength = length(SSname) + var/datum/controller/subsystem/SS + var/SSmatch + for(var/_SS in Master.subsystems) + SS = _SS + if(copytext("[SS.type]", -SSlength) == SSname) + SSmatch = SS + break + if(!SSmatch) + return null + return SSmatch + else + return null -/obj/effect/statclick/SDQL2_delete/Click() +/obj/effect/statclick/SDQL2_delete/clicked() if(!CLIENT_IS_STAFF(usr.client)) message_admins("[key_name_admin(usr)] non-staff clicked on a statclick! ([src])") log_admin("non-staff clicked on a statclick! ([src])") @@ -1215,7 +1352,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null var/datum/sdql2_query/Q = target Q.delete_click() -/obj/effect/statclick/SDQL2_action/Click() +/obj/effect/statclick/SDQL2_action/clicked() if(!CLIENT_IS_STAFF(usr.client)) message_admins("[key_name_admin(usr)] non-staff clicked on a statclick! ([src])") log_admin("non-staff clicked on a statclick! ([src])") @@ -1226,7 +1363,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null /obj/effect/statclick/sdql2_vv_all name = "VIEW VARIABLES" -/obj/effect/statclick/sdql2_vv_all/Click() +/obj/effect/statclick/sdql2_vv_all/clicked() if(!CLIENT_IS_STAFF(usr.client)) message_admins("[key_name_admin(usr)] non-staff clicked on a statclick! ([src])") log_admin("non-staff clicked on a statclick! ([src])") diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 9588e8dc9e..2caea998a1 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -136,6 +136,9 @@ if("call") call_query(i, node) + if("singlecall") + singlecall_query(i, node) + if("explain") node += "explain" node["explain"] = list() @@ -196,6 +199,14 @@ return i +//singlecall_query: 'CALL' object.call_function +/datum/sdql_parser/proc/singlecall_query(i, list/node) + var/list/func = list() + i = variable(i + 1, func) + node["singlecall"] = func + + return i + // object_selectors: select_item [('FROM' | 'IN') from_item] [modifier_list] /datum/sdql_parser/proc/object_selectors(i, list/node) i = select_item(i, node) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index e046990b0a..57b707a8eb 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -175,6 +175,9 @@ /proc/_sin(X) return sin(X) +/proc/_sleep(Delay) + sleep(Delay) + /proc/_list_add(list/L, ...) if (args.len < 2) return diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index 9491475ace..400e1f0f6f 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -353,3 +353,14 @@ icon_state = "ob_console" dir = WEST flags_atom = ON_BORDER|CONDUCT|FPRINT + +/obj/structure/machinery/prop/almayer/CICmap/arc + name = "map terminal" + desc = "A terminal that displays a map of the current operation location." + icon = 'icons/obj/vehicles/interiors/arc.dmi' + icon_state = "arcmap" + density = FALSE + +/obj/structure/machinery/computer/overwatch/almayer/arc + icon = 'icons/obj/vehicles/interiors/arc.dmi' + icon_state = "arcconsole" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 262ae11219..f6aa0a9018 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -152,8 +152,10 @@ var/const/MAX_SAVE_SLOTS = 10 var/g_eyes = 0 //Eye color var/b_eyes = 0 //Eye color var/species = "Human" //Species datum to use. - var/ethnicity = "Western" // Ethnicity - var/body_type = "Mesomorphic (Average)" // Body Type + var/ethnicity = "Western" //Legacy, kept to update save files + var/skin_color = "Pale 2" // Skin color + var/body_size = "Average" // Body Size + var/body_type = "Lean" // Body Type var/language = "None" //Secondary language var/list/gear //Custom/fluff item loadout. var/preferred_squad = "None" @@ -333,8 +335,9 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "®" dat += "Age: [age]
    " dat += "Gender: [gender == MALE ? "Male" : "Female"]
    " - dat += "Ethnicity: [ethnicity]
    " - dat += "Body Type: [body_type]
    " + dat += "Skin Color: [skin_color]
    " + dat += "Body Size: [body_size]
    " + dat += "Body Muscularity: [body_type]
    " dat += "Traits: Character Traits" dat += "
    " @@ -1183,10 +1186,12 @@ var/const/MAX_SAVE_SLOTS = 10 real_name = character_origin.generate_human_name(gender) if ("age") age = rand(AGE_MIN, AGE_MAX) - if ("ethnicity") - ethnicity = random_ethnicity() + if ("skin_color") + skin_color = random_skin_color() if ("body_type") body_type = random_body_type() + if ("body_size") + body_size = random_body_size() if ("hair") r_hair = rand(0,255) g_hair = rand(0,255) @@ -1545,18 +1550,24 @@ var/const/MAX_SAVE_SLOTS = 10 if(new_h_gradient_style) grad_style = new_h_gradient_style - if ("ethnicity") - var/new_ethnicity = tgui_input_list(user, "Choose your character's ethnicity:", "Character Preferences", GLOB.ethnicities_list) + if ("skin_color") + var/new_skin_color = tgui_input_list(user, "Choose your character's skin color:", "Character Preferences", GLOB.skin_color_list) - if (new_ethnicity) - ethnicity = new_ethnicity + if (new_skin_color) + skin_color = new_skin_color if ("body_type") - var/new_body_type = tgui_input_list(user, "Choose your character's body type:", "Character Preferences", GLOB.body_types_list) + var/new_body_type = tgui_input_list(user, "Choose your character's body type:", "Character Preferences", GLOB.body_type_list) if (new_body_type) body_type = new_body_type + if ("body_size") + var/new_body_size = tgui_input_list(user, "Choose your character's body size:", "Character Preferences", GLOB.body_size_list) + + if (new_body_size) + body_size = new_body_size + if("facial") var/new_facial = input(user, "Choose your character's facial-hair color:", "Character Preference", rgb(r_facial, g_facial, b_facial)) as color|null if(new_facial) @@ -2047,8 +2058,9 @@ var/const/MAX_SAVE_SLOTS = 10 character.age = age character.gender = gender - character.ethnicity = ethnicity + character.skin_color = skin_color character.body_type = body_type + character.body_size = body_size character.r_eyes = r_eyes character.g_eyes = g_eyes @@ -2120,15 +2132,16 @@ var/const/MAX_SAVE_SLOTS = 10 message_admins("[character] ([character.ckey]) has spawned with their gender as plural or neuter. Please notify coders.") character.gender = MALE -// Transfers the character's physical characteristics (age, gender, ethnicity, etc) to the mob +// Transfers the character's physical characteristics (age, gender, skin color, etc) to the mob /datum/preferences/proc/copy_appearance_to(mob/living/carbon/human/character, safety = 0) if(!istype(character)) return character.age = age character.gender = gender - character.ethnicity = ethnicity + character.skin_color = skin_color character.body_type = body_type + character.body_size = body_size character.r_eyes = r_eyes character.g_eyes = g_eyes diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 321ce98fd9..868d33a332 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -573,10 +573,67 @@ var/global/list/gear_datums_by_name = list() display_name = "Die, 20 sides" path = /obj/item/toy/dice/d20 -/datum/gear/toy/walkman +/datum/gear/cassettes + category = "Cassettes" + +/datum/gear/cassettes/walkman display_name = "Walkman" path = /obj/item/device/walkman +/datum/gear/cassettes/pop1 + display_name = "Blue Cassette" + path = /obj/item/device/cassette_tape/pop1 + cost = 1 + +/datum/gear/cassettes/pop2 + display_name = "Rainbow Cassette" + path = /obj/item/device/cassette_tape/pop2 + cost = 1 + +/datum/gear/cassettes/pop3 + display_name = "Orange Cassette" + path = /obj/item/device/cassette_tape/pop3 + cost = 1 + +/datum/gear/cassettes/pop4 + display_name = "Blue Cassette" + path = /obj/item/device/cassette_tape/pop4 + cost = 1 + +/datum/gear/cassettes/heavymetal + display_name = "Red-Black Cassette" + path = /obj/item/device/cassette_tape/heavymetal + cost = 1 + +/datum/gear/cassettes/hairmetal + display_name = "Red Striped Cassette" + path = /obj/item/device/cassette_tape/hairmetal + cost = 1 + +/datum/gear/cassettes/indie + display_name = "Rising Sun Cassette" + path = /obj/item/device/cassette_tape/indie + cost = 1 + +/datum/gear/cassettes/hiphop + display_name = "Blue Stripe Cassette" + path = /obj/item/device/cassette_tape/hiphop + cost = 1 + +/datum/gear/cassettes/nam + display_name = "Green Cassette" + path = /obj/item/device/cassette_tape/nam + cost = 1 + +/datum/gear/cassettes/ocean + display_name = "Ocean Cassette" + path = /obj/item/device/cassette_tape/ocean + cost = 1 + +/datum/gear/cassettes/pouch + display_name = "Cassette Pouch" + path = /obj/item/storage/pouch/cassette + /datum/gear/toy/crayon display_name = "Crayon" path = /obj/item/toy/crayon/rainbow @@ -905,10 +962,6 @@ var/global/list/gear_datums_by_name = list() path = /obj/item/clothing/mask/cigarette/cigar cost = 2 -/datum/gear/smoking/pack_emerald_green - display_name = "Pack Of Emerald Greens" - path = /obj/item/storage/fancy/cigarettes/emeraldgreen - /datum/gear/smoking/pack_lucky_strikes display_name = "Pack Of Lucky Strikes" path = /obj/item/storage/fancy/cigarettes/lucky_strikes diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 44af545e2e..1403b64bc4 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -1,5 +1,5 @@ #define SAVEFILE_VERSION_MIN 8 -#define SAVEFILE_VERSION_MAX 24 +#define SAVEFILE_VERSION_MAX 25 //handles converting savefiles to new formats //MAKE SURE YOU KEEP THIS UP TO DATE! @@ -110,6 +110,53 @@ S.cd = "/" + if(savefile_version < 25) + var/ethnicity + var/skin_color = "pale2" + S["ethnicity"] >> ethnicity + switch(ethnicity) + if("anglo") + skin_color = "pale2" + if("western") + skin_color = "tan2" + if("germanic") + skin_color = "pale2" + if("scandinavian") + skin_color = "pale3" + if("baltic") + skin_color = "pale3" + if("sinoorient") + skin_color = "pale1" + if("southorient") + skin_color = "tan1" + if("indian") + skin_color = "tan3" + if("sino") + skin_color = "tan1" + if("mesoamerican") + skin_color = "tan3" + if("northamerican") + skin_color = "tan3" + if("southamerican") + skin_color = "tan2" + if("circumpolar") + skin_color = "tan1" + if("northafrican") + skin_color = "tan3" + if("centralafrican") + skin_color = "dark1" + if("costalafrican") + skin_color = "dark3" + if("persian") + skin_color = "tan3" + if("levant") + skin_color = "tan3" + if("australasian") + skin_color = "dark2" + if("polynesian") + skin_color = "tan3" + S["skin_color"] << skin_color + savefile_version = SAVEFILE_VERSION_MAX return 1 @@ -472,7 +519,9 @@ S["gender"] >> gender S["age"] >> age S["ethnicity"] >> ethnicity + S["skin_color"] >> skin_color S["body_type"] >> body_type + S["body_size"] >> body_size S["language"] >> language S["spawnpoint"] >> spawnpoint @@ -549,8 +598,9 @@ be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body)) gender = sanitize_gender(gender) age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) - ethnicity = sanitize_ethnicity(ethnicity) + skin_color = sanitize_skin_color(skin_color) body_type = sanitize_body_type(body_type) + body_size = sanitize_body_size(body_size) r_hair = sanitize_integer(r_hair, 0, 255, initial(r_hair)) g_hair = sanitize_integer(g_hair, 0, 255, initial(g_hair)) b_hair = sanitize_integer(b_hair, 0, 255, initial(b_hair)) @@ -628,7 +678,9 @@ S["gender"] << gender S["age"] << age S["ethnicity"] << ethnicity + S["skin_color"] << skin_color S["body_type"] << body_type + S["body_size"] << body_size S["language"] << language S["hair_red"] << r_hair S["hair_green"] << g_hair diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index 1a11545ea4..365a8a551a 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -231,7 +231,8 @@ /obj/item/clothing/shoes/royal_marine name = "\improper L10 pattern combat boots" desc = "Standard issue combat boots for combat scenarios or combat situations. Used by the three world empires royal marines commando units." - icon_state = "rmc_boots" + icon_state = "marine" + item_state = "marine" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH armor_laser = CLOTHING_ARMOR_LOW diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 736d4f9474..9d15211f21 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -511,9 +511,9 @@ overlay_node = TRUE overlays += staticnode -/obj/effect/alien/weeds/node/Initialize(mapload, obj/effect/alien/weeds/node/node, mob/living/carbon/xenomorph/xeno, datum/hive_status/hive) - if (istype(hive)) - linked_hive = hive +/obj/effect/alien/weeds/node/Initialize(mapload, hive, mob/living/carbon/xenomorph/xeno) + if (hive) + linked_hive = GLOB.hive_datum[hive] else if (istype(xeno) && xeno.hive) linked_hive = xeno.hive else diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm index 86bc3f5917..33f341c9e2 100644 --- a/code/modules/cm_marines/equipment/mortar/mortars.dm +++ b/code/modules/cm_marines/equipment/mortar/mortars.dm @@ -215,9 +215,6 @@ if(busy) to_chat(user, SPAN_WARNING("Someone else is currently using [src].")) return - if(!is_ground_level(z)) - to_chat(user, SPAN_WARNING("You cannot fire [src] here.")) - return if(targ_x == 0 && targ_y == 0) //Mortar wasn't set to_chat(user, SPAN_WARNING("[src] needs to be aimed first.")) return @@ -385,9 +382,6 @@ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't have the training to deploy [src].")) return - if(!is_ground_level(deploy_turf.z)) - to_chat(user, SPAN_WARNING("You cannot deploy [src] here.")) - return var/area/A = get_area(deploy_turf) if(CEILING_IS_PROTECTED(A.ceiling, CEILING_PROTECTION_TIER_1)) to_chat(user, SPAN_WARNING("You probably shouldn't deploy [src] indoors.")) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index 2e17dfe9ef..687fca47f7 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -299,7 +299,7 @@ new_human.change_real_name(new_human, "Ivan") new_human.f_style = "Shaved" new_human.h_style = "Shaved Head" - new_human.ethnicity = "Scandinavian" + new_human.skin_color = "pale3" new_human.r_hair = 165 new_human.g_hair = 42 new_human.b_hair = 42 @@ -362,7 +362,7 @@ new_human.b_facial = 51 new_human.h_style = "Mullet" new_human.f_style = "Full English" - new_human.ethnicity = "Anglo" + new_human.skin_color = "pale2" new_human.r_eyes = 102 //Brown eyes. new_human.g_eyes = 51 new_human.b_eyes = 0 diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index a9061b57a4..82ba128bcd 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -139,6 +139,7 @@ /datum/equipment_preset/uscm/pfc/forecon name = "FORECON Squad Rifleman" paygrade = "ME3" + skills = /datum/skills/pfc/recon /datum/equipment_preset/uscm/pfc/forecon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/standard @@ -200,6 +201,7 @@ /datum/equipment_preset/uscm/sg/forecon name = "FORECON Squad Smartgunner" paygrade = "ME5" + skills = /datum/skills/smartgunner/recon /datum/equipment_preset/uscm/sg/forecon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/standard @@ -466,6 +468,7 @@ name = "FORECON Squad Corpsman" assignment = "Squad Corpsman" paygrade = "ME5" + skills = /datum/skills/combat_medic/recon /datum/equipment_preset/uscm/medic/forecon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic/standard @@ -517,6 +520,8 @@ name = "FORECON Assistant Squad Leader" assignment = "Assistant Squad Leader" paygrade = "ME6" + role_comm_title = "aSL" + skills = /datum/skills/tl/recon /datum/equipment_preset/uscm/tl/forecon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/standard @@ -601,9 +606,10 @@ paygrade = "UE6" /datum/equipment_preset/uscm/leader/forecon - name = "FORECON Squad Sergeant" - assignment = "Squad Sergeant" + name = "FORECON Squad Leader" + assignment = "Squad Leader" paygrade = "ME8" + role_comm_title = "SL" /datum/equipment_preset/uscm/leader/forecon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/standard diff --git a/code/modules/gear_presets/yautja.dm b/code/modules/gear_presets/yautja.dm index 27eac7215f..8ffd8664a9 100644 --- a/code/modules/gear_presets/yautja.dm +++ b/code/modules/gear_presets/yautja.dm @@ -12,13 +12,13 @@ /datum/equipment_preset/yautja/load_race(mob/living/carbon/human/new_human, client/mob_client) new_human.set_species(SPECIES_YAUTJA) - new_human.ethnicity = "tan" + new_human.skin_color = "tan" new_human.body_type = "pred" //can be removed in future for body types if(!mob_client) mob_client = new_human.client if(mob_client?.prefs) new_human.h_style = mob_client.prefs.predator_h_style - new_human.ethnicity = mob_client.prefs.predator_skin_color + new_human.skin_color = mob_client.prefs.predator_skin_color /datum/equipment_preset/yautja/load_id(mob/living/carbon/human/new_human) new_human.job = rank diff --git a/code/modules/mob/living/carbon/human/exercise.dm b/code/modules/mob/living/carbon/human/exercise.dm index 3a2976da91..7e40c63d88 100644 --- a/code/modules/mob/living/carbon/human/exercise.dm +++ b/code/modules/mob/living/carbon/human/exercise.dm @@ -101,7 +101,7 @@ Verbs related to getting fucking jacked, bro /mob/living/carbon/human/proc/calculate_stamina_loss_per_pushup(on_knees = FALSE) //humans have 100 stamina //default loss per pushup = 5 stamina - var/stamina_loss = 5 + var/stamina_loss = 2 if(!skills || issynth(src)) return 0 switch(skills.get_skill_level(SKILL_ENDURANCE)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a04dd5c94b..837f193c4c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1270,10 +1270,18 @@ if(!H || H.w_uniform?.sensor_mode != SENSOR_MODE_LOCATION) return - if(H.z != src.z || get_dist(src,H) < 1 || src == H) + + var/atom/tracking_atom = H + if(tracking_atom.z != src.z && SSinterior.in_interior(tracking_atom)) + var/datum/interior/interior = SSinterior.get_interior_by_coords(tracking_atom.x, tracking_atom.y, tracking_atom.z) + var/atom/exterior = interior.exterior + if(exterior) + tracking_atom = exterior + + if(tracking_atom.z != src.z || get_dist(src, tracking_atom) < 1 || src == tracking_atom) hud_used.locate_leader.icon_state = "trackondirect[tracking_suffix]" else - hud_used.locate_leader.setDir(get_dir(src,H)) + hud_used.locate_leader.setDir(get_dir(src, tracking_atom)) hud_used.locate_leader.icon_state = "trackon[tracking_suffix]" /mob/living/carbon/proc/locate_nearest_nuke() diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index cd6abd2262..a3424a1815 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -25,8 +25,9 @@ var/g_eyes = 0 var/b_eyes = 0 - var/ethnicity = "Western" // Ethnicity - var/body_type = "Mesomorphic (Average)" // Body Type + var/skin_color = "Pale 2" // Skin color + var/body_size = "Average" // Body Size + var/body_type = "Lean" // Body Buffness //Skin color var/r_skin = 0 diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index a98de60d3e..9a3b796764 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -9,72 +9,65 @@ g = "f" return g -/proc/get_limb_icon_name(datum/species/S, body_type, gender, limb_name, ethnicity) - if(S.uses_ethnicity) +/proc/get_limb_icon_name(datum/species/S, body_size, body_type, gender, limb_name, skin_color) + if(S.uses_skin_color) + if(S.special_body_types) + switch(limb_name) + if("torso") + return "[skin_color]_torso_[body_size]_[body_type]" + if("chest") + return "[skin_color]_torso_[body_size]_[body_type]" + if("head") + return "[skin_color]_[limb_name]" + if("groin") + return "[skin_color]_[limb_name]_[body_size]" + + if(!S.special_body_types) + switch(limb_name) + if("torso") + return "[skin_color]_torso_[body_type]_[get_gender_name(gender)]" + if("chest") + return "[skin_color]_torso_[body_type]_[get_gender_name(gender)]" + if("head") + return "[skin_color]_[limb_name]_[get_gender_name(gender)]" + if("groin") + return "[skin_color]_[limb_name]_[body_type]_[get_gender_name(gender)]" switch(limb_name) - if ("torso") - return "[ethnicity]_torso_[body_type]_[get_gender_name(gender)]" - - if ("chest") - return "[ethnicity]_torso_[body_type]_[get_gender_name(gender)]" - - if ("head") - return "[ethnicity]_[limb_name]_[get_gender_name(gender)]" - - if ("groin") - return "[ethnicity]_[limb_name]_[get_gender_name(gender)]" - if("synthetic head") return "head_[get_gender_name(gender)]" - if ("r_arm") - return "[ethnicity]_right_arm" - - if ("right arm") - return "[ethnicity]_right_arm" - - if ("l_arm") - return "[ethnicity]_left_arm" - - if ("left arm") - return "[ethnicity]_left_arm" - - if ("r_leg") - return "[ethnicity]_right_leg" - - if ("right leg") - return "[ethnicity]_right_leg" - - if ("l_leg") - return "[ethnicity]_left_leg" - - if ("left leg") - return "[ethnicity]_left_leg" - - if ("r_hand") - return "[ethnicity]_right_hand" - - if ("right hand") - return "[ethnicity]_right_hand" - - if ("l_hand") - return "[ethnicity]_left_hand" - - if ("left hand") - return "[ethnicity]_left_hand" - - if ("r_foot") - return "[ethnicity]_right_foot" - - if ("right foot") - return "[ethnicity]_right_foot" - - if ("l_foot") - return "[ethnicity]_left_foot" - - if ("left foot") - return "[ethnicity]_left_foot" - + if("r_arm") + return "[skin_color]_right_arm" + if("right arm") + return "[skin_color]_right_arm" + if("l_arm") + return "[skin_color]_left_arm" + if("left arm") + return "[skin_color]_left_arm" + if("r_leg") + return "[skin_color]_right_leg" + if("right leg") + return "[skin_color]_right_leg" + if("l_leg") + return "[skin_color]_left_leg" + if("left leg") + return "[skin_color]_left_leg" + if("r_hand") + return "[skin_color]_right_hand" + if("right hand") + return "[skin_color]_right_hand" + if("l_hand") + return "[skin_color]_left_hand" + if("left hand") + return "[skin_color]_left_hand" + if("r_foot") + return "[skin_color]_right_foot" + if("right foot") + return "[skin_color]_right_foot" + if("l_foot") + return "[skin_color]_left_foot" + if("left foot") + return "[skin_color]_left_foot" else message_admins("DEBUG: Something called get_limb_icon_name() incorrectly, they use the name [limb_name]") return null @@ -147,28 +140,37 @@ return null /mob/living/carbon/human/proc/set_limb_icons() - var/datum/ethnicity/E = GLOB.ethnicities_list[ethnicity] - var/datum/body_type/B = GLOB.body_types_list[body_type] + var/datum/skin_color/set_skin_color = GLOB.skin_color_list[skin_color] + var/datum/body_size/set_body_size = GLOB.body_size_list[body_size] + var/datum/body_type/set_body_type = GLOB.body_type_list[body_type] - var/e_icon - var/b_icon + var/skin_color_icon + var/body_size_icon + var/body_type_icon - if (!E) - e_icon = "western" + if(!set_skin_color) + skin_color_icon = "pale2" else - e_icon = E.icon_name + skin_color_icon = set_skin_color.icon_name - if (!B) - b_icon = "mesomorphic" + if(!set_body_size) + body_size_icon = "avg" else - b_icon = B.icon_name + body_size_icon = set_body_size.icon_name + + + if(!set_body_type) + body_type_icon = "lean" + else + body_type_icon = set_body_type.icon_name if(isspeciesyautja(src)) - e_icon = src.ethnicity - b_icon = src.body_type + skin_color_icon = skin_color + body_size_icon = body_size + body_type_icon = body_type - for(var/obj/limb/L in limbs) - L.icon_name = get_limb_icon_name(species, b_icon, gender, L.display_name, e_icon) + for(var/obj/limb/L as anything in limbs) + L.icon_name = get_limb_icon_name(species, body_size_icon, body_type_icon, gender, L.display_name, skin_color_icon) /mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone) if(species?.flags & IS_SYNTHETIC) diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm index add78365a3..a50b6a9285 100644 --- a/code/modules/mob/living/carbon/human/species/human.dm +++ b/code/modules/mob/living/carbon/human/species/human.dm @@ -88,7 +88,8 @@ unarmed_type = /datum/unarmed_attack/punch flags = HAS_SKIN_TONE|HAS_LIPS|HAS_UNDERWEAR|HAS_HARDCRIT mob_flags = KNOWS_TECHNOLOGY - uses_ethnicity = TRUE + uses_skin_color = TRUE + special_body_types = TRUE /datum/species/human/handle_on_fire(humanoidmob) . = ..() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index d2177cf49a..da14b0f88f 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -14,7 +14,8 @@ var/icobase_source // if we want to use sourcing system var/deform_source var/eyes = "eyes_s" // Icon for eyes. - var/uses_ethnicity = FALSE //Set to TRUE to load proper ethnicities and what have you + var/uses_skin_color = FALSE //Set to TRUE to load proper skin_colors and what have you + var/special_body_types = FALSE var/primitive // Lesser form, if any (ie. monkey for humans) var/tail // Name of tail image in species effects icon file. diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index d521ed2a63..b418c0acb0 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -2,7 +2,8 @@ group = SPECIES_SYNTHETIC name = SYNTH_GEN_THREE name_plural = "synthetics" - uses_ethnicity = TRUE //Uses ethnic presets + uses_skin_color = TRUE //Uses skin color presets + special_body_types = TRUE unarmed_type = /datum/unarmed_attack/punch/synthetic pain_type = /datum/pain/synthetic @@ -58,7 +59,8 @@ /datum/species/synthetic/gen_one name = SYNTH_GEN_ONE - uses_ethnicity = FALSE + uses_skin_color = FALSE + special_body_types = FALSE mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) hair_color = "#000000" @@ -67,12 +69,14 @@ /datum/species/synthetic/gen_two name = SYNTH_GEN_TWO - uses_ethnicity = FALSE //2nd gen uses generic human look + uses_skin_color = FALSE //2nd gen uses generic human look + special_body_types = FALSE /datum/species/synthetic/colonial name = SYNTH_COLONY name_plural = "Colonial Synthetics" - uses_ethnicity = TRUE + uses_skin_color = TRUE + special_body_types = TRUE brute_mod = 0.8 burn_mod = 0.8 mob_inherent_traits = list(TRAIT_SUPER_STRONG) @@ -84,11 +88,12 @@ /datum/species/synthetic/colonial/colonial_gen_two name = SYNTH_COLONY_GEN_TWO - uses_ethnicity = FALSE //2nd gen uses generic human look + uses_skin_color = FALSE //2nd gen uses generic human look /datum/species/synthetic/colonial/colonial_gen_one name = SYNTH_COLONY_GEN_ONE - uses_ethnicity = FALSE + uses_skin_color = FALSE + special_body_types = FALSE mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) //sets colonial_gen_one synth's hair to black hair_color = "#000000" @@ -100,7 +105,8 @@ /datum/species/synthetic/colonial/combat name = SYNTH_COMBAT name_plural = "Combat Synthetics" - uses_ethnicity = FALSE + uses_skin_color = FALSE + special_body_types = FALSE mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES) brute_mod = 0.5 @@ -121,7 +127,7 @@ /datum/species/synthetic/infiltrator name = SYNTH_INFILTRATOR name_plural = "Infiltrator Synthetics" - uses_ethnicity = TRUE + uses_skin_color = TRUE mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INFILTRATOR_SYNTH) 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 292c302f93..b0dd35c74b 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 @@ -2,7 +2,7 @@ name = SYNTH_WORKING_JOE name_plural = "Working Joes" death_message = "violently gargles fluid and seizes up, the glow in their eyes dimming..." - uses_ethnicity = FALSE + 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) 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 f8ecb3e059..ec82a58dff 100644 --- a/code/modules/mob/living/carbon/human/species/yautja/_species.dm +++ b/code/modules/mob/living/carbon/human/species/yautja/_species.dm @@ -6,7 +6,7 @@ burn_mod = 0.65 reagent_tag = IS_YAUTJA mob_flags = KNOWS_TECHNOLOGY - uses_ethnicity = TRUE + uses_skin_color = TRUE flags = IS_WHITELISTED|HAS_SKIN_COLOR|NO_CLONE_LOSS|NO_POISON|NO_NEURO|SPECIAL_BONEBREAK|NO_SHRAPNEL|HAS_HARDCRIT mob_inherent_traits = list( TRAIT_YAUTJA_TECH, diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index 0a6e0ff2ca..2b254fdba9 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -141,7 +141,7 @@ playsound(xeno.loc, pick(xeno.screech_sound_effect_list), 75, 0, status = 0) xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an ear-splitting guttural roar!")) - xeno.create_shriekwave() //Adds the visual effect. Wom wom wom + xeno.create_shriekwave(14) //Adds the visual effect. Wom wom wom, 14 shriekwaves for(var/mob/mob in view()) if(mob && mob.client) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index 958e0f7a2f..aa8bf7eae6 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -67,7 +67,7 @@ xeno.visible_message(SPAN_XENONOTICE("\The [xeno] regurgitates a pulsating node and plants it on the ground!"), \ SPAN_XENONOTICE("You regurgitate a pulsating node and plant it on the ground!"), null, 5) - var/obj/effect/alien/weeds/node/new_node = new node_type(xeno.loc, src, xeno) + var/obj/effect/alien/weeds/node/new_node = new node_type(xeno.loc, xeno.hivenumber, xeno) if(to_convert) for(var/cur_weed in to_convert) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm index 3c475743c0..73d5ace965 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm @@ -15,7 +15,7 @@ playsound(xeno.loc, pick(predalien_roar), 75, 0, status = 0) xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits a guttural roar!")) - xeno.create_shriekwave(color = "#FF0000") + xeno.create_shriekwave(7) for(var/mob/living/carbon/carbon in view(7, xeno)) if(ishuman(carbon)) diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index 271ac7bbe3..05123b4d71 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -445,6 +445,12 @@ Make sure their actual health updates immediately.*/ QL.icon_state = "trackoff" return + if(tracking_atom.loc.z != loc.z && SSinterior.in_interior(tracking_atom)) + var/datum/interior/interior = SSinterior.get_interior_by_coords(tracking_atom.x, tracking_atom.y, tracking_atom.z) + var/atom/exterior = interior.exterior + if(exterior) + tracking_atom = exterior + if(tracking_atom.loc.z != loc.z || get_dist(src, tracking_atom) < 1 || src == tracking_atom) QL.icon_state = "trackondirect" else diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index 880f23f2d8..0fbe71192a 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -190,31 +190,46 @@ overlays_standing[X_LEGCUFF_LAYER] = image("icon" = 'icons/mob/xenos/effects.dmi', "icon_state" = "legcuff", "layer" =-X_LEGCUFF_LAYER) apply_overlay(X_LEGCUFF_LAYER) -/mob/living/carbon/xenomorph/proc/create_shriekwave(color = null) - var/image/screech_image - - var/offset_x = 0 - var/offset_y = 0 - if(mob_size <= MOB_SIZE_XENO) - offset_x = -7 - offset_y = -10 - - if (color) - screech_image = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shriek_waves_greyscale") // For Praetorian screech - screech_image.color = color - else - screech_image = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shriek_waves") //Ehh, suit layer's not being used. - - screech_image.pixel_x = offset_x - screech_image.pixel_y = offset_y - - screech_image.appearance_flags |= RESET_COLOR - - remove_suit_layer() - - overlays_standing[X_SUIT_LAYER] = screech_image - apply_overlay(X_SUIT_LAYER) - addtimer(CALLBACK(src, PROC_REF(remove_overlay), X_SUIT_LAYER), 30) +/mob/living/carbon/xenomorph/proc/create_shriekwave(shriekwaves_left) + var/offset_y = 8 + if(mob_size == MOB_SIZE_XENO) + offset_y = 24 + if(mob_size == MOB_SIZE_IMMOBILE) + offset_y = 28 + + //the shockwave center is updated eachtime shockwave is called and offset relative to the mob_size. + //due to the speed of the shockwaves, it isn't required to be tied to the exact mob movements + var/epicenter = loc //center of the shockwave, set at the center of the tile that the mob is currently standing on + var/easing = QUAD_EASING | EASE_OUT + var/stage1_radius = rand(11, 12) + var/stage2_radius = rand(9, 11) + var/stage3_radius = rand(8, 10) + var/stage4_radius = 7.5 + + //shockwaves are iterated, counting down once per shriekwave, with the total amount being determined on the respective xeno ability tile + if(shriekwaves_left > 12) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage1_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 2) + return + if(shriekwaves_left > 8) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage2_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3) + return + if(shriekwaves_left > 4) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage3_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3) + return + if(shriekwaves_left > 1) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage4_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3) + return + if(shriekwaves_left == 1) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, 10.5, 0.6, easing, offset_y) /mob/living/carbon/xenomorph/proc/create_stomp() remove_suit_layer() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 08412dab48..b60039840d 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -249,7 +249,7 @@ var/global/list/limb_types_by_name = list( message = replace_X.Replace(message, "CKTH") return message -#define PIXELS_PER_STRENGTH_VAL 24 +#define PIXELS_PER_STRENGTH_VAL 28 /proc/shake_camera(mob/M, steps = 1, strength = 1, time_per_step = 1) if(!M?.client || (M.shakecamera > world.time)) @@ -260,10 +260,10 @@ var/global/list/limb_types_by_name = list( var/old_X = M.client.pixel_x var/old_y = M.client.pixel_y - animate(M.client, pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = JUMP_EASING, time = time_per_step, flags = ANIMATION_PARALLEL) + animate(M.client, pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = CUBIC_EASING | EASE_IN, time = time_per_step, flags = ANIMATION_PARALLEL) var/i = 1 while(i < steps) - animate(pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = JUMP_EASING, time = time_per_step) + animate(pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = CUBIC_EASING | EASE_IN, time = time_per_step) i++ animate(pixel_x = old_X, pixel_y = old_y,time = Clamp(Floor(strength/PIXELS_PER_STRENGTH_VAL),2,4))//ease it back diff --git a/code/modules/mob/new_player/body.dm b/code/modules/mob/new_player/body.dm new file mode 100644 index 0000000000..9f2b3e8182 --- /dev/null +++ b/code/modules/mob/new_player/body.dm @@ -0,0 +1,31 @@ +/datum/body_type + var/name + var/icon_name + +/datum/body_type/twig + name = "No Muscles" + icon_name = "twig" + +/datum/body_type/lean + name = "Lean" + icon_name = "lean" + +/datum/body_type/ripped + name = "Ripped" + icon_name = "buff" + +/datum/body_size + var/name + var/icon_name + +/datum/body_size/thin + name = "Thin" + icon_name = "sml" + +/datum/body_size/average + name = "Average" + icon_name = "avg" + +/datum/body_size/large + name = "Large" + icon_name = "lrg" diff --git a/code/modules/mob/new_player/body_type.dm b/code/modules/mob/new_player/body_type.dm deleted file mode 100644 index ad35dc2fee..0000000000 --- a/code/modules/mob/new_player/body_type.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/body_type - var/name - var/icon_name - -/datum/body_type/ectomorphic - name = "Ectomorphic (Underweight)" - icon_name = "ecto" - -/datum/body_type/mesomorphic - name = "Mesomorphic (Average)" - icon_name = "meso" - -/datum/body_type/endomorphic - name = "Endomorphic (Overweight)" - icon_name = "endo" diff --git a/code/modules/mob/new_player/ethnicity.dm b/code/modules/mob/new_player/ethnicity.dm deleted file mode 100644 index 433a370f56..0000000000 --- a/code/modules/mob/new_player/ethnicity.dm +++ /dev/null @@ -1,114 +0,0 @@ -/datum/ethnicity - var/name - var/icon_name - var/ethnic_category - -/datum/ethnicity/anglo - name = "Anglo" - icon_name = "anglo" - ethnic_category = "European" - -/datum/ethnicity/western - name = "Western" - icon_name = "western" - ethnic_category = "European" - -/datum/ethnicity/germanic - name = "Germanic" - icon_name = "germanic" - ethnic_category = "European" - -/datum/ethnicity/scandinavian - name = "Scandinavian" - icon_name = "scandinavian" - ethnic_category = "European" - -/datum/ethnicity/baltic - name = "Baltic" - icon_name = "baltic" - ethnic_category = "European" - -/datum/ethnicity/sinoorient - name = "Sino-Orient" - icon_name = "sinoorient" - ethnic_category = "Oriental" - -/datum/ethnicity/eastorient - name = "East-Orient" - icon_name = "eastorient" - ethnic_category = "Oriental" - -/datum/ethnicity/southorient - name = "South-Orient" - icon_name = "southasian" - ethnic_category = "Oriental" - -/datum/ethnicity/indian - name = "Indian" - icon_name = "indian" - ethnic_category = "Oriental" - -/datum/ethnicity/sino - name = "Eurasian" - icon_name = "eurasian" - ethnic_category = "Oriental" - -/datum/ethnicity/mesoamerican - name = "Mesoamerican" - icon_name = "mesoamerican" - ethnic_category = "American" - -/datum/ethnicity/northamerican - name = "North American" - icon_name = "northamerican" - ethnic_category = "American" - -/datum/ethnicity/southamerican - name = "South American" - icon_name = "southamerican" - ethnic_category = "American" - -/datum/ethnicity/circumpolar - name = "Circumpolar" - icon_name = "circumpolar" - ethnic_category = "American" - -/datum/ethnicity/northafrican - name = "North African" - icon_name = "northafrican" - ethnic_category = "African" - -/datum/ethnicity/centralafrican - name = "Central African" - icon_name = "centralafrican" - ethnic_category = "African" - -/datum/ethnicity/costalafrican - name = "Coastal African" - icon_name = "costalafrican" - ethnic_category = "African" - -/datum/ethnicity/persian - name = "Persian" - icon_name = "persian" - ethnic_category = "Middle Eastern" - -/datum/ethnicity/arabian - name = "Arabian" - icon_name = "arabian" - ethnic_category = "Middle Eastern" - -/datum/ethnicity/levant - name = "Levant" - icon_name = "levant" - ethnic_category = "Middle Eastern" - -/datum/ethnicity/australasian - name = "Australasian" - icon_name = "australasian" - ethnic_category = "Oceania" - -/datum/ethnicity/polynesian - name = "Polynesian" - icon_name = "polynesian" - ethnic_category = "Oceania" diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 5c2f73922c..b76f980480 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -6,8 +6,9 @@ else gender = FEMALE - ethnicity = random_ethnicity() + skin_color = random_skin_color() body_type = random_body_type() + body_size = random_body_size() h_style = random_hair_style(gender, species) f_style = random_facial_hair_style(gender, species) diff --git a/code/modules/mob/new_player/skin_color.dm b/code/modules/mob/new_player/skin_color.dm new file mode 100644 index 0000000000..f3158613c3 --- /dev/null +++ b/code/modules/mob/new_player/skin_color.dm @@ -0,0 +1,47 @@ +/datum/skin_color + var/name + var/icon_name + +/datum/skin_color/cmplayer + name = "Extra Pale" + icon_name = "cmp1" + +/datum/skin_color/pale1 + name = "Pale 1" + icon_name = "pale1" + +/datum/skin_color/pale2 + name = "Pale 2" + icon_name = "pale2" + +/datum/skin_color/pale3 + name = "Pale 3" + icon_name = "pale3" + +/datum/skin_color/tan1 + name = "Tan 1" + icon_name = "tan1" + +/datum/skin_color/tan2 + name = "Tan 2" + icon_name = "tan2" + +/datum/skin_color/tan3 + name = "Tan 3" + icon_name = "tan3" + +/datum/skin_color/dark1 + name = "Dark 1" + icon_name = "dark1" + +/datum/skin_color/dark2 + name = "Dark 2" + icon_name = "dark2" + +/datum/skin_color/dark3 + name = "Dark 3" + icon_name = "dark3" + +/datum/skin_color/melanated + name = "Melanated" + icon_name = "mel1" diff --git a/code/modules/mob/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/new_player/sprite_accessories/undershirt.dm index 39f0e3ddd1..5919b75636 100644 --- a/code/modules/mob/new_player/sprite_accessories/undershirt.dm +++ b/code/modules/mob/new_player/sprite_accessories/undershirt.dm @@ -112,12 +112,6 @@ GLOBAL_LIST_INIT_TYPED(undershirt_f, /datum/sprite_accessory/undershirt, setup_u gender = FEMALE camo_conforming = TRUE -/datum/sprite_accessory/undershirt/halter_top - name = "Haltertop" - icon_state = "halter" - gender = FEMALE - camo_conforming = TRUE - /datum/sprite_accessory/undershirt/strapless_bra name = "Strapless Bra" icon_state = "strapless" diff --git a/code/modules/mob/new_player/sprite_accessories/underwear.dm b/code/modules/mob/new_player/sprite_accessories/underwear.dm index 200f3f2f67..869179619e 100644 --- a/code/modules/mob/new_player/sprite_accessories/underwear.dm +++ b/code/modules/mob/new_player/sprite_accessories/underwear.dm @@ -58,29 +58,33 @@ GLOBAL_LIST_INIT_TYPED(underwear_f, /datum/sprite_accessory/underwear, setup_und if("s") name += " (Snow)" -// Plural +// Both /datum/sprite_accessory/underwear/boxers name = "Boxers" icon_state = "boxers" - gender = PLURAL + gender = NEUTER camo_conforming = TRUE -// Male /datum/sprite_accessory/underwear/briefs name = "Briefs" icon_state = "briefs" - gender = MALE + gender = NEUTER camo_conforming = TRUE -// Female -/datum/sprite_accessory/underwear/panties - name = "Panties" - icon_state = "panties" - gender = FEMALE +/datum/sprite_accessory/underwear/lowriders + name = "Lowriders" + icon_state = "lowriders" + gender = NEUTER camo_conforming = TRUE -/datum/sprite_accessory/underwear/thong - name = "Thong" - icon_state = "thong" - gender = FEMALE +/datum/sprite_accessory/underwear/satin + name = "Satin" + icon_state = "satin" + gender = NEUTER + camo_conforming = TRUE + +/datum/sprite_accessory/underwear/tanga + name = "Tanga" + icon_state = "tanga" + gender = NEUTER camo_conforming = TRUE diff --git a/code/modules/organs/limb_objects.dm b/code/modules/organs/limb_objects.dm index 734f303c7f..4bc3ae5cfa 100644 --- a/code/modules/organs/limb_objects.dm +++ b/code/modules/organs/limb_objects.dm @@ -22,27 +22,34 @@ icon = base - var/datum/ethnicity/E = GLOB.ethnicities_list[H.ethnicity] - var/datum/body_type/B = GLOB.body_types_list[H.body_type] + var/datum/skin_color/set_skin_color = GLOB.skin_color_list[H.skin_color] + var/datum/body_type/set_body_type = GLOB.body_type_list[H.body_type] + var/datum/body_size/set_body_size = GLOB.body_size_list[H.body_size] - var/e_icon - var/b_icon + var/skin_color_icon + var/body_type_icon + var/body_size_icon - if (!E) - e_icon = "western" + if(!set_skin_color) + skin_color_icon = "pale2" else - e_icon = E.icon_name + skin_color_icon = set_skin_color.icon_name - if (!B) - b_icon = "mesomorphic" + if(!set_body_type) + body_type_icon = "lean" else - b_icon = B.icon_name + body_type_icon = set_body_type.icon_name + + if(!set_body_size) + body_size_icon = "avg" + else + body_size_icon = set_body_size.icon_name if(isspeciesyautja(H)) - e_icon = H.ethnicity - b_icon = H.body_type + skin_color_icon = H.skin_color + body_type_icon = H.body_type - icon_state = "[get_limb_icon_name(H.species, b_icon, H.gender, name, e_icon)]" + icon_state = "[get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, name, skin_color_icon)]" setDir(SOUTH) apply_transform(turn(transform, rand(70,130))) diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm index de7adcf2ae..99a104ea55 100644 --- a/code/modules/organs/limbs.dm +++ b/code/modules/organs/limbs.dm @@ -71,11 +71,14 @@ var/status = LIMB_ORGANIC var/processing = FALSE - /// ethnicity of the owner, used for limb appearance, set in [/obj/limb/proc/update_limb()] - var/ethnicity = "western" + /// skin color of the owner, used for limb appearance, set in [/obj/limb/proc/update_limb()] + var/skin_color = "Pale 2" - /// body type of the owner, used for limb appearance, set in [/obj/limb/proc/update_limb()] - var/body_type = "mesomorphic" + /// body size of the owner, used for limb appearance, set in [/obj/limb/proc/update_limb()] + var/body_size = "Average" + + /// body muscularity of the owner, used for limb appearance, set in [/obj/limb/proc/update_limb()] + var/body_type = "Lean" /// species of the owner, used for limb appearance, set in [/obj/limb/proc/update_limb()] var/datum/species/species @@ -686,22 +689,29 @@ This function completely restores a damaged organ to perfect condition. /obj/limb/proc/update_limb() SHOULD_CALL_PARENT(TRUE) - var/datum/ethnicity/owner_ethnicity = GLOB.ethnicities_list[owner?.ethnicity] + var/datum/skin_color/owner_skin_color = GLOB.skin_color_list[owner?.skin_color] - if(owner_ethnicity) - ethnicity = owner_ethnicity.icon_name + if(owner_skin_color) + skin_color = owner_skin_color.icon_name else - ethnicity = "western" + skin_color = "pale2" - var/datum/body_type/owner_body_type = GLOB.body_types_list[owner?.body_type] + var/datum/body_type/owner_body_type = GLOB.body_type_list[owner?.body_type] if(owner_body_type) body_type = owner_body_type.icon_name else - body_type = "mesomorphic" + body_type = "lean" + + var/datum/body_type/owner_body_size = GLOB.body_size_list[owner?.body_size] + + if(owner_body_size) + body_size = owner_body_size.icon_name + else + body_size = "avg" if(isspeciesyautja(owner)) - ethnicity = owner.ethnicity + skin_color = owner.skin_color body_type = owner.body_type species = owner?.species ? owner.species : GLOB.all_species[SPECIES_HUMAN] @@ -731,7 +741,7 @@ This function completely restores a damaged organ to perfect condition. return limb.icon = species.icobase - limb.icon_state = "[get_limb_icon_name(species, body_type, limb_gender, icon_name, ethnicity)]" + limb.icon_state = "[get_limb_icon_name(species, body_size, body_type, limb_gender, icon_name, skin_color)]" . += limb @@ -741,7 +751,7 @@ This function completely restores a damaged organ to perfect condition. /obj/limb/proc/get_limb_icon_key() SHOULD_CALL_PARENT(TRUE) - return "[species.name]-[body_type]-[limb_gender]-[icon_name]-[ethnicity]-[status]" + return "[species.name]-[body_size]-[body_type]-[limb_gender]-[icon_name]-[skin_color]-[status]" // new damage icon system // returns just the brute/burn damage code diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm index df8a7d7bdd..91c11b242a 100644 --- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm @@ -79,6 +79,7 @@ var/overlay_gun_type = "_m41" //used for text overlay var/overlay_content = "_reg" var/magazine_type = /obj/item/ammo_magazine/rifle + var/list/allowed_magazines = list() var/num_of_magazines = 10 var/handfuls = FALSE var/icon_state_deployed = null diff --git a/code/modules/projectiles/ammo_boxes/box_structures.dm b/code/modules/projectiles/ammo_boxes/box_structures.dm index 77020baab5..a7cbb43f68 100644 --- a/code/modules/projectiles/ammo_boxes/box_structures.dm +++ b/code/modules/projectiles/ammo_boxes/box_structures.dm @@ -131,7 +131,7 @@ to_chat(user, SPAN_DANGER("It's on fire and might explode!")) return if(!item_box.handfuls) - if(istypestrict(W,item_box.magazine_type)) + if(istypestrict(W,item_box.magazine_type) || is_type_in_list(W, item_box.allowed_magazines)) if(istype(W, /obj/item/storage/box/m94)) var/obj/item/storage/box/m94/flare_pack = W if(flare_pack.contents.len < flare_pack.max_storage_space) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 09d98809a7..320693db36 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -60,17 +60,26 @@ /obj/item/ammo_box/magazine/heap/empty empty = TRUE - + /obj/item/ammo_box/magazine/mk1 name = "magazine box (M41A MK1 X 10)" flags_equip_slot = SLOT_BACK overlay_ammo_type = "_reg" overlay_content = "_reg" magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1 + allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon) /obj/item/ammo_box/magazine/mk1/empty empty = TRUE +/obj/item/ammo_box/magazine/mk1/heap + name = "magazine box (HEAP M41A MK1 X 10)" + overlay_ammo_type = "_heap" + overlay_content = "_heap" + magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1/heap + +/obj/item/ammo_box/magazine/mk1/heap/empty + empty = TRUE //-----------------------M39 Rifle Mag Boxes----------------------- /obj/item/ammo_box/magazine/m39 diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 4f0daf2a2b..0b14f1db09 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -2822,6 +2822,10 @@ Defined in conflicts.dm of the #defines folder. max_range = 10 attachment_firing_delay = 30 +/obj/item/attachable/attached_gun/grenade/mk1/recon + icon_state = "green_grenade-mk1" + attach_icon = "green_grenade-mk1_a" + /obj/item/attachable/attached_gun/grenade/m203 //M16 GL, only DD have it. name = "\improper M203 Grenade Launcher" desc = "An antique underbarrel grenade launcher. Adopted in 1969 for the M16, it was made obsolete centuries ago; how its ended up here is a mystery to you. Holds only one propriatary 40mm grenade, does not have modern IFF systems, it won't pass through your friends." diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index c18e45e38d..c97d0f82f9 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -171,11 +171,17 @@ /obj/item/weapon/gun/boltaction/vulture/update_icon() ..() + var/new_icon_state = src::icon_state + if(!current_mag) + new_icon_state += "_e" + + icon_state = new_icon_state + if(!bolted) overlays += "vulture_bolt_open" -/obj/item/weapon/gun/boltaction/vulture/set_gun_config_values() //check that these work +/obj/item/weapon/gun/boltaction/vulture/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_VULTURE) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_7 @@ -192,13 +198,11 @@ attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 24, "under_x" = 25, "under_y" = 14, "stock_x" = 11, "stock_y" = 15) /obj/item/weapon/gun/boltaction/vulture/able_to_fire(mob/user) - . = ..() - if(!.) - return - if(!bypass_trait && !HAS_TRAIT(user, TRAIT_VULTURE_USER)) to_chat(user, SPAN_WARNING("You don't know how to use this!")) - return + return FALSE + + return ..() /obj/item/weapon/gun/boltaction/vulture/Fire(atom/target, mob/living/user, params, reflex, dual_wield) var/obj/item/attachable/vulture_scope/scope = attachments["rail"] diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index ba2e925ed5..48918ef2ee 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -425,6 +425,17 @@ /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition." starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/grenade/mk1) + +/obj/item/weapon/gun/rifle/m41aMK1/forecon + desc = "Pulse action 10x24mm caseless assault rifle of the USCMC, personal friend of any Marine. This one is painted in a fresh coat of the newer Humbrol 76 camouflage and is used by Force Reconnaissance units." + icon_state = "reconm41amk1" + item_state = "reconm41amk1" + current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/recon + starting_attachment_types = list(/obj/item/attachable/attached_gun/grenade/mk1/recon, /obj/item/attachable/stock/rifle/collapsible) + +/obj/item/weapon/gun/rifle/m41aMK1/forecon/unloaded + current_mag = null + //---------------------------------------------- //Special gun for the CO to replace the smartgun diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 91f7bbca33..6721920583 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -86,6 +86,7 @@ default_ammo = /datum/ammo/bullet/rifle ammo_band_icon = "+m41a_mk1_band" ammo_band_icon_empty = "+m41a_mk1_band_e" + bonus_overlay = "m41a_mk1_overlay" /obj/item/ammo_magazine/rifle/m41aMK1/rubber name = "\improper M41A Less Lethal magazine" @@ -128,6 +129,11 @@ desc = "A long rectangular box of rounds that is only compatible with the older M41A MK1. Holds up to 99 rounds. This one contains wall-penetrating bullets." default_ammo = /datum/ammo/bullet/rifle/ap/penetrating ammo_band_color = AMMO_BAND_COLOR_PENETRATING + +/obj/item/ammo_magazine/rifle/m41aMK1/recon + icon_state = "m41a_mk1_recon" + current_rounds = 95 + bonus_overlay = "m41a_mk1_recon_overlay" //------------------------------------------------------- //M4RA, l42 reskin, same stats as before but different, lore friendly, shell. diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 9e2574eabb..3c26685a55 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -82,6 +82,7 @@ var/list/shotgun_boxes_12g = list( /obj/item/ammo_magazine/shotgun/buckshot/special name = "box of buckshot shells, USCM special type" desc = "A box filled with buckshot spread shotgun shells, USCM special type. 12 Gauge." + icon_state = "special" default_ammo = /datum/ammo/bullet/shotgun/buckshot/special //------------------------------------------------------- @@ -205,6 +206,7 @@ var/list/shotgun_handfuls_12g = list( /obj/item/ammo_magazine/handful/shotgun/buckshot/special name = "handful of shotgun buckshot shells, USCM special type (12g)" + icon_state = "special_buck_5" default_ammo = /datum/ammo/bullet/shotgun/buckshot/special /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 5c762e2dc1..c75ea5daba 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -192,8 +192,8 @@ if(F && !(projectile_flags & PROJECTILE_SHRAPNEL)) permutated |= F //Don't hit the shooter (firer) - else if (S && (projectile_flags & PROJECTILE_SHRAPNEL)) - permutated |= S + if (S) + permutated |= get_atom_on_turf(S) //Don't hit the originating object permutated |= src //Don't try to hit self. shot_from = S @@ -354,15 +354,14 @@ if((speed * world.tick_lag) >= get_dist(current_turf, target_turf)) SEND_SIGNAL(src, COMSIG_BULLET_TERMINAL) - // Check we can reach the turf at all based on pathed grid - var/proj_dir = get_dir(current_turf, next_turf) - if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf)) - ammo.on_hit_turf(current_turf, src) - current_turf.bullet_act(src) - return TRUE - // Check for hits that would occur when moving to turf, such as a blocking cade - if(scan_a_turf(next_turf, proj_dir)) + var/list/ignore_list + var/obj/item/hardpoint/hardpoint = shot_from + if(istype(hardpoint)) + LAZYOR(ignore_list, hardpoint.owner) //if fired from a vehicle, exclude the vehicle's body from the adjacency check + + // Check we can reach the turf at all based on pathed grid + if(check_canhit(current_turf, next_turf, ignore_list)) return TRUE // Actually move @@ -599,6 +598,19 @@ if(SEND_SIGNAL(src, COMSIG_BULLET_POST_HANDLE_MOB, L, .) & COMPONENT_BULLET_PASS_THROUGH) return FALSE +/obj/projectile/proc/check_canhit(turf/current_turf, turf/next_turf, list/ignore_list) + var/proj_dir = get_dir(current_turf, next_turf) + if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf, ignore_list = ignore_list)) + ammo.on_hit_turf(current_turf, src) + current_turf.bullet_act(src) + return TRUE + + // Check for hits that would occur when moving to turf, such as a blocking cade + if(scan_a_turf(next_turf, proj_dir)) + return TRUE + + return FALSE + //---------------------------------------------------------- // \\ // HITTING THE TARGET \\ diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index 45e66c182e..bbeeca2e3c 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -363,6 +363,21 @@ properties = list(PROPERTY_NUTRITIOUS = 1) flags = REAGENT_TYPE_MEDICAL +/datum/reagent/cornsyrup + name = "High-Fructose Corn Syrup" + id = "cornsyrup" + description = "Ah, some good old, all-american, high-fructose corn syrup. Sickeningly sweet. There's worse things you can put in your body, but very few of them are made to be put there." + color = "#593512" // rgb: 89, 53, 18 + chemclass = CHEM_CLASS_NONE + properties = list(PROPERTY_NUTRITIOUS = 1) + +/datum/reagent/sucralose + name = "Sucralose" + id = "sucralose" + description = "600 times the flavor of sugar, with none of the calories!" + color = "#FFFFFF" // rgb: 255, 255, 255 + chemclass = CHEM_CLASS_NONE + /datum/reagent/glycerol name = "Glycerol" id = "glycerol" diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index 98de810c22..f9a6e47dcd 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) V.add_hardpoint(FPW) FPW.dir = turn(V.dir, 90) FPW.name = "Left "+ initial(FPW.name) - FPW.origins = list(2, 0) + FPW.origins = list(1, 0) FPW.muzzle_flash_pos = list( "1" = list(-18, 14), "2" = list(18, -42), @@ -195,7 +195,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) V.add_hardpoint(FPW) FPW.dir = turn(V.dir, -90) FPW.name = "Right "+ initial(FPW.name) - FPW.origins = list(-2, 0) + FPW.origins = list(-1, 0) FPW.muzzle_flash_pos = list( "1" = list(16, 14), "2" = list(-18, -42), diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm index acdefca18f..44875dddb0 100644 --- a/code/modules/vehicles/hardpoints/hardpoint.dm +++ b/code/modules/vehicles/hardpoints/hardpoint.dm @@ -305,45 +305,6 @@ return data -/// Traces backwards from the gun origin to the vehicle to check for obstacles between the vehicle and the muzzle. -/obj/item/hardpoint/proc/clear_los() - if(origins[1] == 0 && origins[2] == 0) //skipping check for modules we don't need this - return TRUE - - var/turf/muzzle_turf = get_origin_turf() - - var/turf/checking_turf = muzzle_turf - while(!(owner in checking_turf)) - // Dense turfs block LoS - if(checking_turf.density) - return FALSE - - // Ensure that we can pass over all objects in the turf - for(var/obj/object in checking_turf) - // Since vehicles are multitile the - if(object == owner) - continue - - // Non-dense objects are irrelevant - if(!object.density) - continue - - // Make sure we can pass object from all directions - if(!HAS_FLAG(object.pass_flags.flags_can_pass_all, PASS_OVER_THROW_ITEM)) - if(!HAS_FLAG(object.flags_atom, ON_BORDER)) - return FALSE - //If we're behind the object, check the behind pass flags - else if(dir == object.dir && !HAS_FLAG(object.pass_flags.flags_can_pass_behind, PASS_OVER_THROW_ITEM)) - return FALSE - //If we're in front, check front pass flags - else if(dir == turn(object.dir, 180) && !HAS_FLAG(object.pass_flags.flags_can_pass_front, PASS_OVER_THROW_ITEM)) - return FALSE - - // Trace back towards the vehicle - checking_turf = get_step(checking_turf, turn(dir,180)) - - return TRUE - //----------------------------- //------INTERACTION PROCS---------- //----------------------------- @@ -605,10 +566,6 @@ to_chat(user, SPAN_WARNING("The target is not within your firing arc!")) return NONE - if(!clear_los()) - to_chat(user, SPAN_WARNING("The muzzle is obstructed!")) - return NONE - return handle_fire(target, user, params) /// Actually fires the gun, sets up the projectile and fires it. diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm index 3de4876c09..a53dec38d5 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm @@ -4,7 +4,7 @@ caliber = "grenade" icon_state = "glauncher_2" w_class = SIZE_LARGE - default_ammo = /datum/ammo/grenade_container + default_ammo = /datum/ammo/grenade_container/tank_glauncher max_rounds = 20 gun_type = /obj/item/hardpoint/secondary/grenade_launcher diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm index 9d83c1816d..caca68f720 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm @@ -5,6 +5,6 @@ caliber = "rocket" //correlates to any rocket mags icon_state = "quad_rocket" w_class = SIZE_LARGE - default_ammo = /datum/ammo/rocket/ap + default_ammo = /datum/ammo/rocket/ap/tank_towlauncher max_rounds = 10 gun_type = /obj/item/hardpoint/secondary/towlauncher diff --git a/code/modules/vehicles/hardpoints/holder/tank_turret.dm b/code/modules/vehicles/hardpoints/holder/tank_turret.dm index 6e5140be5f..5f8cc46e3f 100644 --- a/code/modules/vehicles/hardpoints/holder/tank_turret.dm +++ b/code/modules/vehicles/hardpoints/holder/tank_turret.dm @@ -218,8 +218,3 @@ target = L return ..() - -/obj/item/hardpoint/holder/tank_turret/get_origin_turf() - var/origin_turf = ..() - origin_turf = get_step(get_step(origin_turf, owner.dir), owner.dir) //this should get us tile in front of tank to prevent grenade being stuck under us. - return origin_turf diff --git a/code/modules/vehicles/hardpoints/primary/arc_frontal.dm b/code/modules/vehicles/hardpoints/primary/arc_frontal.dm index 68dd21aafa..a9f720412d 100644 --- a/code/modules/vehicles/hardpoints/primary/arc_frontal.dm +++ b/code/modules/vehicles/hardpoints/primary/arc_frontal.dm @@ -13,8 +13,6 @@ health = 2000 firing_arc = 120 - origins = list(0, -2) - allowed_seat = VEHICLE_DRIVER ammo = new /obj/item/ammo_magazine/hardpoint/m56_cupola/frontal_cannon diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm index aa4ec68128..343516f614 100644 --- a/code/modules/vehicles/hardpoints/primary/autocannon.dm +++ b/code/modules/vehicles/hardpoints/primary/autocannon.dm @@ -10,8 +10,6 @@ health = 2000 firing_arc = 60 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/ace_autocannon max_clips = 2 diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index db5790c258..224712ef55 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -14,7 +14,7 @@ health = 1500 firing_arc = 60 - origins = list(0, -2) + origins = list(0, 1) allowed_seat = VEHICLE_DRIVER diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm index f9c01de165..c858d9bf30 100644 --- a/code/modules/vehicles/hardpoints/primary/flamer.dm +++ b/code/modules/vehicles/hardpoints/primary/flamer.dm @@ -10,8 +10,6 @@ health = 2000 firing_arc = 90 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/primary_flamer max_clips = 1 @@ -33,9 +31,8 @@ BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) )) -/obj/item/hardpoint/primary/flamer/try_fire(target, user, params) - var/turf/origin_turf = get_origin_turf() - if(origin_turf == get_turf(target)) +/obj/item/hardpoint/primary/flamer/try_fire(atom/target, mob/living/user, params) + if(get_turf(target) in owner.locs) to_chat(user, SPAN_WARNING("The target is too close.")) return NONE diff --git a/code/modules/vehicles/hardpoints/primary/ltb.dm b/code/modules/vehicles/hardpoints/primary/ltb.dm index 83e8c1ba96..34911ef25b 100644 --- a/code/modules/vehicles/hardpoints/primary/ltb.dm +++ b/code/modules/vehicles/hardpoints/primary/ltb.dm @@ -10,8 +10,6 @@ health = 2000 firing_arc = 60 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/ltb_cannon max_clips = 4 diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm index 0aee9ae5f7..c0885ee03a 100644 --- a/code/modules/vehicles/hardpoints/primary/minigun.dm +++ b/code/modules/vehicles/hardpoints/primary/minigun.dm @@ -9,8 +9,6 @@ health = 2000 firing_arc = 90 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/ltaaap_minigun max_clips = 2 diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm index 25926c02db..6323ce8c5b 100644 --- a/code/modules/vehicles/hardpoints/secondary/cupola.dm +++ b/code/modules/vehicles/hardpoints/secondary/cupola.dm @@ -10,8 +10,6 @@ health = 2000 firing_arc = 120 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/m56_cupola max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/secondary/flamer.dm b/code/modules/vehicles/hardpoints/secondary/flamer.dm index b2a959feb4..ce517ac276 100644 --- a/code/modules/vehicles/hardpoints/secondary/flamer.dm +++ b/code/modules/vehicles/hardpoints/secondary/flamer.dm @@ -10,8 +10,6 @@ health = 2000 firing_arc = 120 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/secondary_flamer max_clips = 1 @@ -29,14 +27,28 @@ scatter = 2 fire_delay = 1.5 SECONDS +/obj/item/hardpoint/secondary/small_flamer/try_fire(atom/target, mob/living/user, params) + if(get_turf(target) in owner.locs) + to_chat(user, SPAN_WARNING("The target is too close.")) + return NONE + + return ..() + /obj/item/hardpoint/secondary/small_flamer/handle_fire(atom/target, mob/living/user, params) - var/turf/origin_turf = get_origin_turf() + //step forward along path so flame starts outside hull + var/list/turfs = get_line(get_origin_turf(), get_turf(target)) + var/turf/origin_turf + for(var/turf/turf as anything in turfs) + if(turf in owner.locs) + continue + origin_turf = turf + break var/distance = get_dist(origin_turf, get_turf(target)) var/fire_amount = min(ammo.current_rounds, distance+1, max_range) ammo.current_rounds -= fire_amount - new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target, CALLBACK(src, PROC_REF(display_ammo), user)) + new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target) play_firing_sounds() diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index 073e54e855..8129e3f0f3 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -13,7 +13,7 @@ health = 2000 firing_arc = 120 - origins = list(0, -2) + origins = list(0, -1) allowed_seat = VEHICLE_DRIVER diff --git a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm index 4d847e3aa2..c149502c44 100644 --- a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm +++ b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm @@ -9,9 +9,6 @@ health = 2000 firing_arc = 120 - var/max_range = 7 - - origins = list(0, -2) ammo = new /obj/item/ammo_magazine/hardpoint/tank_glauncher max_clips = 3 @@ -34,9 +31,8 @@ BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) )) -/obj/item/hardpoint/secondary/grenade_launcher/try_fire(mob/user, atom/A) - var/turf/origin_turf = get_origin_turf() - if(origin_turf == get_turf(A)) +/obj/item/hardpoint/secondary/grenade_launcher/try_fire(atom/target, mob/living/user, params) + if(get_turf(target) in owner.locs) to_chat(user, SPAN_WARNING("The target is too close.")) return NONE diff --git a/code/modules/vehicles/hardpoints/secondary/tow.dm b/code/modules/vehicles/hardpoints/secondary/tow.dm index 868bd96117..2a12b050df 100644 --- a/code/modules/vehicles/hardpoints/secondary/tow.dm +++ b/code/modules/vehicles/hardpoints/secondary/tow.dm @@ -9,8 +9,6 @@ health = 2000 firing_arc = 120 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/towlauncher max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm index 780c195f00..f051d9a21b 100644 --- a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm +++ b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm @@ -20,8 +20,6 @@ allowed_seat = VEHICLE_SUPPORT_GUNNER_ONE - origins = list(0, 0) - ammo = new /obj/item/ammo_magazine/hardpoint/firing_port_weapon max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/support/flare.dm b/code/modules/vehicles/hardpoints/support/flare.dm index 7e82fe0d64..f9ce4b604f 100644 --- a/code/modules/vehicles/hardpoints/support/flare.dm +++ b/code/modules/vehicles/hardpoints/support/flare.dm @@ -15,8 +15,6 @@ health = 1500 firing_arc = 120 - origins = list(0, -2) - allowed_seat = VEHICLE_DRIVER ammo = new /obj/item/ammo_magazine/hardpoint/flare_launcher diff --git a/code/modules/vehicles/multitile/multitile_movement.dm b/code/modules/vehicles/multitile/multitile_movement.dm index b5f3081447..b95a7bd057 100644 --- a/code/modules/vehicles/multitile/multitile_movement.dm +++ b/code/modules/vehicles/multitile/multitile_movement.dm @@ -159,7 +159,7 @@ // Crashed with something that stopped us if(!can_move) - move_momentum = Floor(move_momentum/2) + move_momentum = trunc(move_momentum/2) update_next_move() interior_crash_effect() @@ -251,10 +251,10 @@ return // Not enough momentum for anything serious - if(abs(move_momentum) <= 1) + if(abs(move_momentum) < 1) return - var/fling_distance = Ceiling(move_momentum/move_max_momentum) * 2 + var/fling_distance = Ceiling(abs(move_momentum)/move_max_momentum) * 2 var/turf/target = interior.get_middle_turf() for (var/x in 0 to fling_distance-1) @@ -272,7 +272,7 @@ if(isliving(A)) var/mob/living/M = A - shake_camera(M, 2, Ceiling(move_momentum/move_max_momentum) * 1) + shake_camera(M, 2, Ceiling(abs(move_momentum)/move_max_momentum) * 1) if(!M.buckled) M.apply_effect(1, STUN) M.apply_effect(2, WEAKEN) diff --git a/code/modules/vehicles/tank/aev.dm b/code/modules/vehicles/tank/aev.dm new file mode 100644 index 0000000000..3ce66b94f3 --- /dev/null +++ b/code/modules/vehicles/tank/aev.dm @@ -0,0 +1,80 @@ +/obj/vehicle/multitile/tank/aev + name = "M34E1 Armored Engineering Vehicle" + desc = "A giant piece of armor with a plow, you know what to do. Entrance in the back." + desc_lore = "M34E1 is an extremely rare vehicle in the arsenal of USCMC that was developed after Operation Odolla Onslaught conducted by USS Stalwart forces against massive CLF insurrection. Being pinned down with improvised mortars and surrounded by IEDs, marines of 1/2 \"Iron Heads\" outfitted a Longstreet tank with improvised armor and mine plow, sending it unmanned into a minefield and allowing for a quick assault against enemy positions. MEUCOM took notice of this event, and after record-breaking 3 months of development and 10 million dollars of cost introduced M34E1 in limited numbers." + + icon_state = "aev_base" + + hardpoints_allowed = list( + /obj/item/hardpoint/support/overdrive_enhancer, + /obj/item/hardpoint/armor/ballistic, + /obj/item/hardpoint/armor/caustic, + /obj/item/hardpoint/armor/concussive, + /obj/item/hardpoint/armor/paladin, + /obj/item/hardpoint/armor/snowplow, + /obj/item/hardpoint/locomotion/treads, + /obj/item/hardpoint/locomotion/treads/robust, + ) + + + required_skill = SKILL_VEHICLE_LARGE + interior_map = /datum/map_template/interior/aev + + active_hp = list(VEHICLE_DRIVER = null) + + explosive_resistance = 750 + + passengers_slots = 15 + + wall_ram_damage = 500 + +/obj/vehicle/multitile/tank/aev/initialize_cameras(change_tag = FALSE) + if(!camera) + camera = new /obj/structure/machinery/camera/vehicle(src) + if(change_tag) + camera.c_tag = "#[rand(1,100)] M34E1 \"[nickname]\" AEV" + if(camera_int) + camera_int.c_tag = camera.c_tag + " interior" //this fluff allows it to be at the start of cams list + else + camera.c_tag = "#[rand(1,100)] M34E1 AEV" + if(camera_int) + camera_int.c_tag = camera.c_tag + " interior" //this fluff allows it to be at the start of cams list + +/obj/vehicle/multitile/tank/aev/load_hardpoints() + return + +/obj/effect/vehicle_spawner/aev + name = "AEV Spawner" + icon = 'icons/obj/vehicles/tank.dmi' + icon_state = "aev_base" + pixel_x = -48 + pixel_y = -48 + +/obj/effect/vehicle_spawner/aev/Initialize() + . = ..() + spawn_vehicle() + qdel(src) + +/obj/effect/vehicle_spawner/aev/spawn_vehicle() + var/obj/vehicle/multitile/tank/aev/AEV = new(loc) + + load_misc(AEV) + load_hardpoints(AEV) + handle_direction(AEV) + AEV.update_icon() + + return AEV + +/obj/effect/vehicle_spawner/aev/load_hardpoints(obj/vehicle/multitile/tank/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/armor/snowplow) + V.add_hardpoint(new /obj/item/hardpoint/support/overdrive_enhancer) + +/obj/effect/vehicle_spawner/aev/decrepit/spawn_vehicle() + var/obj/vehicle/multitile/tank/aev/AEV = new(loc) + + load_misc(AEV) + handle_direction(AEV) + load_hardpoints(AEV) + load_damage(AEV) + AEV.update_icon() diff --git a/colonialmarines.dme b/colonialmarines.dme index 4e16283d5c..58cee33fcf 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1388,6 +1388,8 @@ #include "code\modules\admin\ToRban.dm" #include "code\modules\admin\game_master\game_master.dm" #include "code\modules\admin\game_master\game_master_submenu.dm" +#include "code\modules\admin\game_master\resin_panel.dm" +#include "code\modules\admin\game_master\sound_panel.dm" #include "code\modules\admin\game_master\extra_buttons\rappel_menu.dm" #include "code\modules\admin\game_master\extra_buttons\rename_platoon.dm" #include "code\modules\admin\game_master\extra_buttons\toggle_join_xeno.dm" @@ -2128,12 +2130,12 @@ #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\drone.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm" -#include "code\modules\mob\new_player\body_type.dm" -#include "code\modules\mob\new_player\ethnicity.dm" +#include "code\modules\mob\new_player\body.dm" #include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\new_player.dm" #include "code\modules\mob\new_player\preferences_setup.dm" +#include "code\modules\mob\new_player\skin_color.dm" #include "code\modules\mob\new_player\sprite_accessories\facial_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\hair.dm" #include "code\modules\mob\new_player\sprite_accessories\hair_gradients.dm" @@ -2458,6 +2460,7 @@ #include "code\modules\vehicles\multitile\multitile_interaction.dm" #include "code\modules\vehicles\multitile\multitile_movement.dm" #include "code\modules\vehicles\multitile\multitile_verbs.dm" +#include "code\modules\vehicles\tank\aev.dm" #include "code\modules\vehicles\tank\interior.dm" #include "code\modules\vehicles\tank\tank.dm" #include "code\modules\vehicles\van\interior.dm" diff --git a/dependencies.sh b/dependencies.sh index 01d0ca5c97..1934553cb0 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -18,4 +18,4 @@ export NODE_VERSION_PRECISE=14.16.1 export SPACEMAN_DMM_VERSION=suite-1.8 # Python version for mapmerge and other tools -export PYTHON_VERSION=3.7.9 +export PYTHON_VERSION=3.9.0 diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml new file mode 100644 index 0000000000..4042cde8ee --- /dev/null +++ b/html/changelogs/archive/2024-07.yml @@ -0,0 +1,7 @@ +2024-07-19: + Meatstuff882: + - rscadd: Added an icon for special buckshot. +2024-07-22: + Doubleumc: + - admin: Radio Clarity slider now shows an example message + - qol: ARC turret shots start from the center of the ARC diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 44ac56e1af..39abfe5ce6 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index 68194665bc..9079bda5e7 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/feet.dmi b/icons/mob/humans/onmob/feet.dmi index 84121e6b09..909a629f72 100644 Binary files a/icons/mob/humans/onmob/feet.dmi and b/icons/mob/humans/onmob/feet.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 139dae66e8..fcd8917c9c 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/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 04faa8dc5b..92ae62c7bc 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index e59858d94b..78e7ab199a 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 5ee10a5942..8a9424ff15 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/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index 7311c0a733..555b5a0e7a 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 5942c9dda6..39e3223891 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/mob/humans/species/r_human.dmi b/icons/mob/humans/species/r_human.dmi index 3e8f63d9f3..4ab300efe5 100644 Binary files a/icons/mob/humans/species/r_human.dmi and b/icons/mob/humans/species/r_human.dmi differ diff --git a/icons/mob/humans/species/r_predator.dmi b/icons/mob/humans/species/r_predator.dmi index e8fe1c1170..192f7d698b 100644 Binary files a/icons/mob/humans/species/r_predator.dmi and b/icons/mob/humans/species/r_predator.dmi differ diff --git a/icons/mob/humans/undershirt.dmi b/icons/mob/humans/undershirt.dmi index 225d413ae0..468778851c 100644 Binary files a/icons/mob/humans/undershirt.dmi and b/icons/mob/humans/undershirt.dmi differ diff --git a/icons/mob/humans/underwear.dmi b/icons/mob/humans/underwear.dmi index b639d0a615..3276ca12ae 100644 Binary files a/icons/mob/humans/underwear.dmi and b/icons/mob/humans/underwear.dmi differ diff --git a/icons/obj/items/chemistry.dmi b/icons/obj/items/chemistry.dmi index 1eaef75bb6..b82be7c88a 100644 Binary files a/icons/obj/items/chemistry.dmi and b/icons/obj/items/chemistry.dmi differ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index b608d278ff..18e011f048 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index ada7540e96..1411de23fb 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 f6a6b57f6b..bc012f71ca 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/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi index 8db72b11cb..599c89484b 100644 Binary files a/icons/obj/items/clothing/ties_overlay.dmi and b/icons/obj/items/clothing/ties_overlay.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 5b9d981ed8..4442a8049d 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/storage.dmi b/icons/obj/items/storage.dmi index 42f91cbab0..52ff2c5baa 100644 Binary files a/icons/obj/items/storage.dmi and b/icons/obj/items/storage.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi index 0c0fcc473a..0d50208cc8 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 5a9be75423..a3691b8cc5 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi index caa62ef556..17e7e6f221 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi index c896053c8e..c5946b587a 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/handful.dmi b/icons/obj/items/weapons/guns/handful.dmi index bbea110531..1d46db248d 100644 Binary files a/icons/obj/items/weapons/guns/handful.dmi and b/icons/obj/items/weapons/guns/handful.dmi differ diff --git a/icons/obj/items/weapons/guns/lineart.dmi b/icons/obj/items/weapons/guns/lineart.dmi index 5d52fd6582..35241cf3a3 100644 Binary files a/icons/obj/items/weapons/guns/lineart.dmi and b/icons/obj/items/weapons/guns/lineart.dmi differ diff --git a/icons/obj/structures/gun_racks.dmi b/icons/obj/structures/gun_racks.dmi index fb4e3c4b9c..5b2819a2bc 100644 Binary files a/icons/obj/structures/gun_racks.dmi and b/icons/obj/structures/gun_racks.dmi differ diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi index 2edd5c048d..048cc64acf 100644 Binary files a/icons/obj/structures/machinery/vending.dmi and b/icons/obj/structures/machinery/vending.dmi differ diff --git a/icons/obj/vehicles/interiors/arc.dmi b/icons/obj/vehicles/interiors/arc.dmi index 9f921a02f8..f6406fab83 100644 Binary files a/icons/obj/vehicles/interiors/arc.dmi and b/icons/obj/vehicles/interiors/arc.dmi differ diff --git a/icons/obj/vehicles/interiors/tank.dmi b/icons/obj/vehicles/interiors/tank.dmi index d0153fedae..7377d481a2 100644 Binary files a/icons/obj/vehicles/interiors/tank.dmi and b/icons/obj/vehicles/interiors/tank.dmi differ diff --git a/icons/obj/vehicles/tank.dmi b/icons/obj/vehicles/tank.dmi index ec8135c2dd..a37188b129 100644 Binary files a/icons/obj/vehicles/tank.dmi and b/icons/obj/vehicles/tank.dmi differ diff --git a/maps/corsat.json b/maps/corsat.json index e819264405..24e8afccbe 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -42,7 +42,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, - "camouflage": "snow", + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/derelict_almayer.json b/maps/derelict_almayer.json index 0d0fc08da4..46108fc4ea 100644 --- a/maps/derelict_almayer.json +++ b/maps/derelict_almayer.json @@ -7,7 +7,7 @@ "announce_text": "An automated distress signal has been received from the \"USS Almayer\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/derelict_almayer/", - "camouflage": "classic", + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index dfc7365541..f278861370 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -33,7 +33,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 0 }, - "camouflage": "classic", + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/interiors/aev.dmm b/maps/interiors/aev.dmm new file mode 100644 index 0000000000..edb12832ce --- /dev/null +++ b/maps/interiors/aev.dmm @@ -0,0 +1,285 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/obj/effect/landmark/interior/spawn/entrance{ + dir = 8; + exit_type = /obj/structure/interior_exit/vehicle/tank; + name = "back entrance marker"; + tag = "back" + }, +/turf/open/shuttle/vehicle, +/area/vehicle/tank) +"c" = ( +/turf/open/shuttle/vehicle, +/area/vehicle/tank) +"e" = ( +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = 8 + }, +/turf/open/shuttle/vehicle{ + icon_state = "floor_3_5" + }, +/area/vehicle/tank) +"f" = ( +/obj/structure/interior_wall/tank{ + layer = 2; + icon_state = "wall_1" + }, +/turf/open/void/vehicle, +/area/space) +"g" = ( +/obj/structure/interior_wall/tank{ + alpha = 50; + icon_state = "exterior_1"; + layer = 5.2; + pixel_y = 32 + }, +/turf/open/void/vehicle, +/area/space) +"i" = ( +/turf/open/void/vehicle, +/area/space) +"j" = ( +/obj/structure/interior_wall/tank{ + icon_state = "back_3" + }, +/turf/open/void/vehicle, +/area/space) +"l" = ( +/obj/structure/interior_wall/tank{ + alpha = 50; + icon_state = "exterior_2"; + layer = 5.2; + pixel_y = 32 + }, +/turf/open/void/vehicle, +/area/space) +"n" = ( +/obj/structure/prop/tank{ + icon_state = "prop_aev2"; + layer = 3 + }, +/turf/open/shuttle/vehicle, +/area/vehicle/tank) +"r" = ( +/obj/structure/interior_wall/tank{ + icon_state = "front_1" + }, +/turf/open/void/vehicle, +/area/space) +"u" = ( +/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{ + dir = 4; + pixel_y = 2 + }, +/obj/structure/prop/tank{ + density = 0; + icon_state = "prop6"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/structure/prop/tank{ + density = 0; + icon_state = "prop4"; + layer = 3; + pixel_x = 0 + }, +/obj/structure/phone_base{ + dir = 8; + layer = 3.1; + name = "AEV Telephone"; + phone_category = "Vehicles"; + phone_id = "M34E1 Armored Engineering Vehicle"; + pixel_x = 14; + pixel_y = -21 + }, +/turf/open/shuttle/vehicle{ + icon_state = "floor_3_5" + }, +/area/vehicle/tank) +"v" = ( +/obj/structure/interior_wall/tank{ + layer = 2 + }, +/turf/open/void/vehicle, +/area/space) +"y" = ( +/obj/structure/interior_wall/tank{ + icon_state = "back_2" + }, +/turf/open/void/vehicle, +/area/space) +"B" = ( +/obj/structure/prop/tank{ + icon_state = "prop_aev1"; + pixel_x = 0 + }, +/obj/structure/prop/tank{ + icon_state = "prop7"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/open/shuttle/vehicle, +/area/vehicle/tank) +"C" = ( +/obj/structure/prop/tank{ + icon_state = "prop_aev2"; + layer = 3 + }, +/turf/open/shuttle/vehicle{ + icon_state = "floor_3_1_1" + }, +/area/vehicle/tank) +"D" = ( +/obj/structure/interior_wall/tank{ + icon_state = "back_1" + }, +/turf/open/void/vehicle, +/area/space) +"G" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/effect/landmark/interior/spawn/interior_viewport{ + pixel_y = 24; + layer = 2.9; + pixel_x = -7 + }, +/turf/open/shuttle/vehicle{ + icon_state = "floor_3_5" + }, +/area/vehicle/tank) +"H" = ( +/obj/structure/interior_wall/tank{ + icon_state = "exterior_3"; + layer = 5.2; + pixel_y = 32 + }, +/turf/open/void/vehicle, +/area/space) +"J" = ( +/obj/effect/landmark/interior/spawn/interior_camera{ + dir = 10; + layer = 3.2; + pixel_x = 12; + pixel_y = 58 + }, +/obj/structure/vehicle_locker/tank{ + pixel_x = 32; + pixel_y = -2 + }, +/turf/open/shuttle/vehicle, +/area/vehicle/tank) +"N" = ( +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + dir = 1; + pixel_x = 8 + }, +/obj/effect/landmark/interior/spawn/interior_viewport{ + dir = 1; + pixel_y = -10; + pixel_x = -7 + }, +/turf/open/shuttle/vehicle{ + icon_state = "floor_3_5" + }, +/area/vehicle/tank) +"T" = ( +/obj/structure/interior_wall/tank{ + icon_state = "front_2" + }, +/turf/open/void/vehicle, +/area/space) +"W" = ( +/obj/structure/interior_wall/tank{ + icon_state = "front_3" + }, +/turf/open/void/vehicle, +/area/space) +"Y" = ( +/obj/structure/interior_wall/tank{ + alpha = 50; + icon_state = "tank_left_2"; + layer = 5.2; + pixel_y = 32 + }, +/turf/open/void/vehicle, +/area/space) +"Z" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/lifeboat{ + name = "Vehicle NanoMed"; + pixel_x = -5; + pixel_y = 31 + }, +/obj/structure/extinguisher_cabinet/lifeboat{ + pixel_x = 9; + pixel_y = 31 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/open/shuttle/vehicle{ + icon_state = "floor_3_5" + }, +/area/vehicle/tank) + +(1,1,1) = {" +j +y +y +D +i +"} +(2,1,1) = {" +v +Z +b +e +g +"} +(3,1,1) = {" +f +G +c +N +l +"} +(4,1,1) = {" +v +u +J +e +Y +"} +(5,1,1) = {" +v +B +n +C +H +"} +(6,1,1) = {" +W +T +T +r +i +"} diff --git a/maps/interiors/arc.dmm b/maps/interiors/arc.dmm index 50c5f96b62..f9371b327e 100644 --- a/maps/interiors/arc.dmm +++ b/maps/interiors/arc.dmm @@ -22,7 +22,14 @@ /obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{ dir = 4 }, -/turf/open/floor, +/obj/structure/gun_rack/apc/frontal{ + desc = "A small compartment that stores ammunition for the ARC's 'Bleihagel RE-RE850 Frontal Rotary Cannon'."; + pixel_y = 6; + pixel_x = 2; + layer = 2.9; + density = 0 + }, +/turf/open/floor/almayer, /area/vehicle/apc/arc) "G" = ( /obj/structure/bed/chair/vehicle{ @@ -41,17 +48,30 @@ layer = 3.1; pixel_y = 5 }, -/turf/open/floor, +/obj/structure/machinery/prop/almayer/CICmap/arc{ + pixel_x = 16 + }, +/obj/structure/machinery/computer/overwatch/almayer/arc{ + pixel_y = 5; + pixel_x = 20 + }, +/turf/open/floor/almayer, /area/vehicle/apc/arc) "I" = ( /obj/structure/bed/chair/vehicle{ pixel_x = -8 }, /obj/effect/landmark/interior/spawn/interior_viewport{ - pixel_x = 8; - pixel_y = 4; + pixel_x = -16; + pixel_y = 11; layer = 2.9 }, +/obj/effect/landmark/interior/spawn/weapons_loader{ + icon = 'icons/obj/vehicles/interiors/arc.dmi'; + icon_state = "arcloader"; + pixel_y = 13; + pixel_x = 7 + }, /turf/open/floor, /area/vehicle/apc/arc) "N" = ( @@ -72,8 +92,7 @@ pixel_x = 8 }, /obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{ - pixel_y = 14; - pixel_x = -8 + pixel_y = 16 }, /turf/open/floor, /area/vehicle/apc/arc) diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index ac7dfa5f1d..4e050d2aa9 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -37,7 +37,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, - "camouflage": "classic", + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 24b7b21870..ec03e22945 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -9,6 +9,28 @@ icon_state = "cyan1" }, /area/golden_arrow/medical) +"ab" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/washing_machine{ + layer = 3.5; + pixel_y = 15 + }, +/obj/item/toy/plush/therapy/green{ + desc = "He seems lonely..."; + layer = 3.6; + name = "Polkovnik Obnimashkin"; + pixel_x = 1; + pixel_y = 26 + }, +/obj/item/clothing/head/uppcap/ushanka{ + layer = 3.6; + pixel_x = 1; + pixel_y = 30 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) "ae" = ( /obj/structure/machinery/power/smes/buildable, /turf/open/floor/almayer{ @@ -82,30 +104,6 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"aI" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/platoon_sergeant) -"aQ" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/sign{ - desc = "Comrade! Don't forget to return your state-issued items to your assigned locker before returning to hypersleep!"; - icon_state = "securearea"; - pixel_y = 30; - name = "Vnimanie! 注意!" - }, -/turf/open/floor/plating, -/area/golden_arrow/cryo_cells) "aS" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 2" @@ -123,15 +121,6 @@ icon_state = "floor2" }, /area/golden_arrow/squad_two) -"bf" = ( -/obj/structure/bed/chair/office/light{ - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/medical) "bg" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 1 @@ -160,20 +149,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/supply) -"bm" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/briefing) "bt" = ( /obj/structure/window/reinforced{ dir = 4; @@ -203,17 +178,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"bC" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/cryo_cells) "bH" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -241,18 +205,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating, /area/golden_arrow/briefing) -"bO" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating, -/area/golden_arrow/cryo_cells) "bR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/supply/ammo/type71, @@ -264,27 +216,17 @@ icon_state = "floor2" }, /area/golden_arrow/squad_two) +"bU" = ( +/obj/structure/machinery/cm_vending/gear/medic_chemical/upp, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/golden_arrow/medical) "cc" = ( /obj/structure/machinery/telecomms/relay/preset/tower, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"cd" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 4; - icon_state = "lattice-simple"; - pixel_y = 10; - pixel_x = 13 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice4"; - pixel_y = 10; - pixel_x = -19 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/briefing) "ce" = ( /obj/structure/machinery/light{ dir = 1 @@ -317,19 +259,19 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"cC" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "chapaevcargo"; - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/supply) "cJ" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/synthcloset) +"cL" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating, +/area/golden_arrow/briefing) "cQ" = ( /obj/structure/bed/chair{ dir = 8 @@ -366,28 +308,28 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) -"cX" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 +"di" = ( +/obj/structure/cargo_container/horizontal/blue/middle{ + opacity = 0; + pixel_x = 17 }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/item/trash/cigbutt/bcigbutt, /turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" + icon_state = "floor2" }, -/area/golden_arrow/briefing) -"dr" = ( -/obj/structure/machinery/body_scanconsole{ - pixel_y = 6; - dir = 1 +/area/golden_arrow/hangar) +"dn" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 1; + name = "\improper Requisitions"; + req_one_access = null }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ - dir = 4; - icon_state = "cyan1" + dir = 8; + icon_state = "multi_tiles" }, -/area/golden_arrow/medical) +/area/golden_arrow/supply) "dx" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply, @@ -416,18 +358,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) -"dD" = ( -/obj/structure/largecrate/random/barrel/blue{ - pixel_x = -9 - }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 20; - pixel_x = -11 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/hangar) "dF" = ( /obj/structure/surface/rack, /obj/item/weapon/straight_razor{ @@ -533,20 +463,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) -"eb" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/reagent_container/spray/cleaner{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_y = 1; - pixel_x = -2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "ei" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/squad_one) @@ -599,6 +515,16 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) +"ew" = ( +/obj/structure/largecrate/random/barrel/blue, +/obj/structure/largecrate/random/barrel/red{ + layer = 4; + pixel_y = 22 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/hangar) "eB" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -615,22 +541,17 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"eF" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/clipboard{ - pixel_x = 4 - }, -/obj/item/reagent_container/pill/cyanide{ - icon_state = "pill5"; - pixel_y = 1; - pixel_x = -8; - name = "cyanide pill" +"eH" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") }, /turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/platoon_commander_rooms) +/area/golden_arrow/cryo_cells) "eL" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/upp, /turf/open/floor/strata{ @@ -683,6 +604,16 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/golden_arrow/engineering) +"fE" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_two) "fJ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ id = "Delta_1"; @@ -701,15 +632,30 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"gl" = ( -/obj/structure/surface/rack, -/obj/item/device/motiondetector/hacked, -/obj/item/ammo_magazine/sentry/upp, -/obj/item/defenses/handheld/sentry/upp, +"ga" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/sign{ + desc = "Comrade! Don't forget to return your state-issued items to your assigned locker before returning to hypersleep!"; + icon_state = "securearea"; + name = "Vnimanie! 注意!"; + pixel_y = 30 + }, +/turf/open/floor/plating, +/area/golden_arrow/cryo_cells) +"gh" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera"; + network = list("Chapaev") + }, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/squad_two) +/area/golden_arrow/briefing) "gm" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -730,42 +676,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"gu" = ( -/obj/structure/cargo_container/horizontal/blue/top{ - pixel_x = 17; - opacity = 0 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/hangar) -"gv" = ( -/obj/structure/largecrate{ - fill_from_loc = 0 - }, -/obj/structure/largecrate{ - pixel_x = -1; - pixel_y = 38; - layer = 3.1; - fill_from_loc = 0 - }, -/obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - layer = 2.9; - name = "Commando Huggs"; - pixel_y = 8; - throwforce = 15 - }, -/obj/item/clothing/head/cmcap{ - layer = 3.0; - pixel_x = -1; - pixel_y = 15 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/hangar) "gx" = ( /obj/structure/closet/secure_closet/engineering_chief, /turf/open/floor/strata{ @@ -782,28 +692,47 @@ icon_state = "floor2" }, /area/golden_arrow/briefing) -"gZ" = ( -/obj/structure/machinery/floodlight/landing/floor, -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 4 +"gX" = ( +/obj/item/prop/colony/used_flare, +/obj/item/prop/colony/used_flare{ + pixel_x = 9; + pixel_y = 10 }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" }, /area/golden_arrow/hangar) -"hh" = ( +"ha" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; name = "ship-grade camera"; network = list("Chapaev") }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/platoon_sergeant) +"he" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "chapaevcargo" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/supply) +"hh" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "hq" = ( /obj/structure/bed/chair{ dir = 8 @@ -813,18 +742,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) -"hr" = ( -/obj/structure/machinery/door/airlock/almayer/maint/colony{ - name = "\improper Requisitions"; - req_one_access = null; - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/supply) "hx" = ( /obj/effect/landmark/start/marine/leader/upp, /obj/effect/landmark/late_join/upp, @@ -869,21 +786,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) -"io" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/obj/item/prop/magazine/book{ - name = "UPP Party Doctrine Booklet"; - desc = "A booklet provided to anyone ranging from conscripts to normal citizenry. The first page is stamped with the Party's insignia and reminds you that the Party has your best interest in heart; the following pages immensely simplify the Party's doctrine, grossly propagandizes Socialism, and greatly vilifies the United Americas."; - pixel_x = 11; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/dorms) "ip" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -997,36 +899,61 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"jF" = ( -/obj/structure/bed/bedroll{ - pixel_y = 21; - pixel_x = -33 +"jp" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 11 }, -/obj/item/device/flashlight/lamp/on{ - pixel_y = 4; - pixel_x = -23 +/obj/item/reagent_container/food/snacks/upp{ + pixel_x = 10; + pixel_y = 6 }, -/obj/item/prop/magazine/book{ - pixel_y = 24; - pixel_x = -33; - desc = "By Geor Georwell."; - name = "1984" +/obj/item/toy/handcard/aceofspades, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" }, -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/golden_arrow/hangar) +/area/golden_arrow/briefing) +"jr" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 1; + name = "\improper Dorms"; + req_one_access = null + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) "jG" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/engineering) -"jH" = ( -/obj/item/newspaper{ - pixel_x = -15; - pixel_y = 34; - desc = "An issue of Kosmicheskaya Pravda, the newspaper circulating in UPP-controlled space." +"jI" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/ammo_magazine/minigun{ + desc = "A huge ammo drum for a huge gun. Your platoon got issued with magazines first which happened several months ago. When will the miniguns come, you wonder?"; + name = "GSh-7.62 rotating ammo drum (7.62x51mm)"; + pixel_x = 6; + pixel_y = 8 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/item/reagent_container/food/drinks/dry_ramen, +/turf/open/floor/strata{ + icon_state = "floor2" }, -/area/golden_arrow/platoon_commander_rooms) +/area/golden_arrow/squad_one) +"jR" = ( +/obj/structure/largecrate{ + pixel_x = 6 + }, +/obj/structure/largecrate{ + layer = 3.1; + pixel_x = 15; + pixel_y = 18 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/hangar) "jS" = ( /obj/effect/landmark/start/marine/upp, /obj/effect/landmark/late_join/upp, @@ -1036,22 +963,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"jV" = ( -/obj/structure/surface/rack, -/obj/structure/machinery/light, -/obj/item/storage/pouch/shotgun/large, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, -/obj/item/weapon/gun/shotgun/type23/pve, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_two) "jX" = ( /obj/structure/bed{ can_buckle = 0 @@ -1064,25 +975,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) -"kb" = ( -/obj/item/clothing/suit/storage/snow_suit/soviet, -/obj/item/clothing/suit/gimmick/jason, -/obj/structure/closet/secure_closet/marine_personal{ - job = "Platoon Commander"; - icon_broken = "cabinetdetective_broken"; - icon_closed = "cabinetdetective"; - icon_locked = "cabinetdetective_locked"; - icon_state = "cabinetdetective_locked"; - icon_opened = "cabinetdetective_open"; - icon_off = "cabinetdetective_broken"; - has_cryo_gear = 0 - }, -/obj/item/clothing/under/marine/veteran/UPP/boiler, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/platoon_commander_rooms) "kh" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/strata{ @@ -1105,6 +997,17 @@ icon_state = "floor3" }, /area/golden_arrow/prep_hallway) +"kn" = ( +/obj/structure/prop{ + desc = "A sturdy metal ladder that leads to lower deck of Chapaev which houses CIC and Brig. The hatch is closed, for now."; + icon_state = "ladder11"; + name = "ladder" + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/golden_arrow/briefing) "kr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1141,31 +1044,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"kB" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 4 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/dorms) -"kS" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/reagent_container/food/drinks/tea{ - pixel_x = -8; - pixel_y = -1 - }, -/obj/item/ashtray/bronze{ - pixel_y = 2; - pixel_x = 4 - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/canteen) "kW" = ( /obj/item/stool, /obj/structure/pipes/vents/pump{ @@ -1183,6 +1061,42 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/golden_arrow/canteen) +"lr" = ( +/obj/structure/bed/bedroll{ + pixel_x = -33; + pixel_y = 21 + }, +/obj/item/device/flashlight/lamp/on{ + pixel_x = -23; + pixel_y = 4 + }, +/obj/item/prop/magazine/book{ + desc = "By Geor Georwell."; + name = "1984"; + pixel_x = -33; + pixel_y = 24 + }, +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/golden_arrow/hangar) +"lu" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap"; + layer = 2.5 + }, +/obj/structure/platform/strata/metal{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/briefing) "lE" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata{ @@ -1190,18 +1104,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) -"lK" = ( -/obj/structure/machinery/cm_vending/gear/synth{ - density = 0; - pixel_y = 32; - name = "\improper UnTech Synthetic Auxiliary Gear Rack" - }, -/obj/item/stool, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/synthcloset) "lN" = ( /obj/structure/machinery/vending/coffee/simple, /turf/open/floor/strata{ @@ -1209,27 +1111,42 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"lS" = ( +"lP" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/paper_bin, -/obj/item/tool/pen{ - pixel_x = 12 +/obj/item/ammo_magazine/handful/shotgun/heavy/flechette{ + current_rounds = 1; + pixel_x = 7; + pixel_y = 6 }, -/obj/item/prop/tableflag/upp{ - pixel_y = 15; - pixel_x = 6 +/obj/item/ammo_magazine/handful/shotgun/heavy{ + current_rounds = 1; + pixel_y = 5 + }, +/obj/item/ammo_magazine/handful/shotgun/heavy/beanbag{ + current_rounds = 1; + pixel_x = -8; + pixel_y = 5 }, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + icon_state = "floor2" }, -/area/golden_arrow/briefing) +/area/golden_arrow/squad_two) "me" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/upp, /turf/open/floor/strata{ icon_state = "floor2" }, /area/golden_arrow/squad_one) +"mh" = ( +/obj/item/newspaper{ + desc = "An issue of Kosmicheskaya Pravda, the newspaper circulating in UPP-controlled space."; + pixel_x = -15; + pixel_y = 34 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/platoon_commander_rooms) "mj" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -1263,17 +1180,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"mv" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 1 - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/platoon_sergeant) "my" = ( /obj/structure/closet, /obj/item/clothing/head/uppcap/ushanka/civi{ @@ -1290,6 +1196,33 @@ icon_state = "floor3" }, /area/golden_arrow/prep_hallway) +"mN" = ( +/obj/structure/largecrate{ + fill_from_loc = 0 + }, +/obj/structure/largecrate{ + fill_from_loc = 0; + layer = 3.1; + pixel_x = -1; + pixel_y = 38 + }, +/obj/item/toy/plush/therapy/red{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + layer = 2.9; + name = "Commando Huggs"; + pixel_y = 8; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 3.0; + pixel_x = -1; + pixel_y = 15 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/hangar) "mT" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -1359,6 +1292,12 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) +"nq" = ( +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/golden_arrow/medical) "ns" = ( /obj/structure/sink{ dir = 4; @@ -1396,10 +1335,45 @@ dir = 4 }, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/engineering) +"nF" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -19; + pixel_y = 10 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_x = 13; + pixel_y = 10 + }, +/turf/open/floor/plating, +/area/golden_arrow/prep_hallway) +"nH" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/clipboard{ + pixel_x = 4 + }, +/obj/item/reagent_container/pill/cyanide{ + icon_state = "pill5"; + name = "cyanide pill"; + pixel_x = -8; + pixel_y = 1 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" }, -/area/golden_arrow/engineering) +/area/golden_arrow/platoon_commander_rooms) "nI" = ( /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/strata{ @@ -1482,20 +1456,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"oW" = ( -/obj/structure/largecrate{ - fill_from_loc = 0 - }, -/obj/item/storage/backpack/marine/ammo_rack{ - pixel_y = 12; - name = "\improper makeshift ammo rack"; - desc = "This ammo rack has been handcrafted by one of the ship's sappers. Union's ingenuity at it's finest." - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/supply) "oX" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/machinery/shower{ @@ -1518,17 +1478,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"pb" = ( -/obj/structure/machinery/cm_vending/clothing/medic/upp, -/obj/item/clothing/head/uppcap{ - pixel_y = 11; - pixel_x = 8 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/medical) "ph" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply, @@ -1557,45 +1506,15 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) -"py" = ( -/obj/structure/machinery/door/airlock/almayer/maint/colony{ - req_one_access = null; - req_one_access_txt = "231;240;237"; - name = "\improper Squad One Armoury" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_one) -"pz" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ammo_magazine/minigun{ - name = "GSh-7.62 rotating ammo drum (7.62x51mm)"; - desc = "A huge ammo drum for a huge gun. Your platoon got issued with magazines first which happened several months ago. When will the miniguns come, you wonder?"; - pixel_y = 8; - pixel_x = 6 +"pw" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/item/reagent_container/food/drinks/dry_ramen, +/obj/structure/gun_rack/type71/unloaded, /turf/open/floor/strata{ icon_state = "floor2" }, -/area/golden_arrow/squad_one) -"pA" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev") - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/medical) +/area/golden_arrow/squad_two) "pH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1604,28 +1523,31 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"pL" = ( -/obj/structure/cargo_container/horizontal/blue/bottom{ - pixel_x = 17; - opacity = 0 +"pQ" = ( +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/space) +"pR" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 }, -/turf/open/floor/strata{ - icon_state = "floor2" +/obj/item/clothing/head/uppcap/beret{ + pixel_x = -6; + pixel_y = 8 }, -/area/golden_arrow/hangar) -"pO" = ( -/obj/structure/cargo_container/horizontal/blue/middle{ - pixel_x = 17; - opacity = 0 +/obj/item/clothing/accessory/armband{ + pixel_x = 6 + }, +/obj/item/tool/screwdriver{ + pixel_x = -9; + pixel_y = 8 }, -/obj/item/trash/cigbutt/bcigbutt, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/hangar) -"pQ" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/space) +/area/golden_arrow/platoon_sergeant) "pS" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/strata{ @@ -1633,32 +1555,6 @@ icon_state = "floor3" }, /area/golden_arrow/canteen) -"pU" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/toy/deck{ - pixel_y = 11; - pixel_x = 8 - }, -/obj/item/reagent_container/food/snacks/upp{ - pixel_x = 10; - pixel_y = 6 - }, -/obj/item/toy/handcard/aceofspades, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/briefing) -"pV" = ( -/obj/structure/largecrate/random/barrel/blue, -/obj/structure/largecrate/random/barrel/red{ - pixel_y = 22; - layer = 4 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/hangar) "pX" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -1685,6 +1581,21 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) +"qc" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/pen{ + pixel_x = 12 + }, +/obj/item/paper_bin, +/obj/item/device/flashlight/lamp{ + pixel_x = 11; + pixel_y = 12 + }, +/obj/item/prop/magazine/book/theartofwar, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/platoon_commander_rooms) "qf" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -1714,19 +1625,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"qu" = ( -/obj/structure/largecrate{ - pixel_x = 6 - }, -/obj/structure/largecrate{ - pixel_x = 15; - pixel_y = 18; - layer = 3.1 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/hangar) "qF" = ( /obj/structure/machinery/autolathe, /turf/open/floor/strata{ @@ -1757,21 +1655,18 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"qQ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/paper_bin, -/obj/item/tool/pen{ - pixel_x = 12 - }, -/obj/item/tool/hand_labeler{ - pixel_y = 12; - pixel_x = -8 +"qU" = ( +/obj/structure/machinery/floodlight/landing/floor, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") }, /turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/platoon_sergeant) +/area/golden_arrow/hangar) "qZ" = ( /obj/structure/machinery/power/apc/almayer{ dir = 8 @@ -1804,6 +1699,19 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) +"rq" = ( +/obj/structure/machinery/floodlight/landing/floor, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/hangar) "ru" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -1837,26 +1745,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"rG" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom"; - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/platoon_commander_rooms) -"rJ" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/briefing) "rL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1866,6 +1754,19 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) +"rQ" = ( +/obj/structure/machinery/computer/overwatch/almayer{ + density = 1; + faction = "UPP" + }, +/obj/item/clothing/glasses/hud/health{ + pixel_x = 7; + pixel_y = 17 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/platoon_commander_rooms) "rV" = ( /obj/structure/closet/secure_closet/marine_personal{ has_cryo_gear = 0; @@ -1944,18 +1845,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/prep_hallway) -"sL" = ( -/obj/item/tool/soap, -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/cryo_cells) "sM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -1965,17 +1854,6 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"sO" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood{ - req_access = list(); - desc = "The MinZdrav Blood Pack Dispensary is the premier, top-of-the-line blood dispenser of 2105! Get yours today!"; - name = "\improper MinZdrav Blood Dispenser"; - vendor_theme = 3 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "sX" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/pen{ @@ -1998,6 +1876,29 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) +"tj" = ( +/obj/structure/cargo_container/horizontal/blue/bottom{ + opacity = 0; + pixel_x = 17 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/hangar) +"tk" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/briefing) "tn" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/accessory/armband/med, @@ -2062,19 +1963,18 @@ icon_state = "dark_sterile" }, /area/golden_arrow/dorms) -"tL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/maint/colony{ - name = "\improper Platoon Sergeant's Bunk"; - req_one_access = null; - req_one_access_txt = "240"; - dir = 2 +"tP" = ( +/obj/structure/largecrate/random/barrel/blue{ + pixel_x = -9 + }, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ + pixel_x = -11; + pixel_y = 20 }, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + icon_state = "floor2" }, -/area/golden_arrow/platoon_sergeant) +/area/golden_arrow/hangar) "tR" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -2083,16 +1983,7 @@ /turf/open/floor/strata{ icon_state = "floor2" }, -/area/golden_arrow/hangar) -"tS" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/gun_rack/type71/unloaded, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_two) +/area/golden_arrow/hangar) "tT" = ( /obj/structure/machinery/shower{ dir = 8 @@ -2134,10 +2025,10 @@ "tZ" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/platoon_commander_rooms) -"ud" = ( +"ua" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "243;238"; - name = "machinegunner locker" + name = "machinegunner locker"; + req_access_txt = "243;237" }, /obj/item/ammo_magazine/pkp, /obj/item/ammo_magazine/pkp, @@ -2154,7 +2045,7 @@ /turf/open/floor/strata{ icon_state = "floor2" }, -/area/golden_arrow/squad_two) +/area/golden_arrow/squad_one) "uf" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -2229,19 +2120,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/platoon_commander_rooms) -"uS" = ( -/obj/structure/closet/secure_closet{ - req_access_txt = "244;237"; - name = "squad sergeant locker" - }, -/obj/item/clothing/accessory/armband, -/obj/item/device/whistle, -/obj/item/device/binoculars/range/designator, -/obj/item/weapon/gun/rifle/type71/flamer, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_one) "uV" = ( /obj/structure/machinery/light, /turf/open/floor/strata{ @@ -2274,40 +2152,22 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"vi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/marine_personal{ - has_cryo_gear = 0; - job = "Smartgunner" - }, -/obj/item/clothing/shoes/marine/upp, -/obj/item/clothing/under/marine/veteran/UPP, -/obj/item/device/radio/headset/distress/UPP, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/cryo_cells) "vk" = ( /obj/structure/machinery/light, /turf/open/floor/strata{ icon_state = "floor2" }, /area/golden_arrow/hangar) +"vo" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_one) "vq" = ( /obj/structure/largecrate, /obj/structure/largecrate{ @@ -2344,6 +2204,17 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) +"vS" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/golden_arrow/prep_hallway) "vW" = ( /turf/open/floor/strata{ dir = 6; @@ -2451,16 +2322,6 @@ icon_state = "floor3" }, /area/golden_arrow/supply) -"wN" = ( -/obj/structure/machinery/door_control{ - pixel_y = -23; - id = "chapaev_engi" - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/engineering) "wO" = ( /turf/open/floor/strata{ dir = 4; @@ -2505,6 +2366,20 @@ icon_state = "floor2" }, /area/golden_arrow/hangar) +"xv" = ( +/obj/structure/largecrate{ + fill_from_loc = 0 + }, +/obj/item/storage/backpack/marine/ammo_rack{ + desc = "This ammo rack has been handcrafted by one of the ship's sappers. Union's ingenuity at it's finest."; + name = "\improper makeshift ammo rack"; + pixel_y = 12 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/supply) "xz" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/upp, /turf/open/floor/strata{ @@ -2537,21 +2412,6 @@ icon_state = "floor3" }, /area/space) -"xO" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp/on{ - pixel_y = 13 - }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 2; - pixel_x = -9 - }, -/obj/item/trash/semki, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/platoon_sergeant) "xU" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Sergeants Room"; @@ -2575,24 +2435,21 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) -"xY" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/prop/magazine/book{ - name = "UPP Party Doctrine Booklet" - }, -/obj/item/prop/tableflag/upp{ - pixel_y = 1; - pixel_x = 6 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/briefing) "xZ" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/golden_arrow/squad_one) +"yc" = ( +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ + pixel_x = -23; + pixel_y = 20 + }, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ + pixel_x = -31; + pixel_y = 10 + }, +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/golden_arrow/hangar) "ye" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -2609,24 +2466,55 @@ }, /turf/open/floor/plating, /area/golden_arrow/engineering) -"ys" = ( -/obj/item/tool/mop{ - pixel_x = 17; - pixel_y = -2 +"yq" = ( +/obj/structure/barricade/handrail/strata{ + dir = 4 }, -/obj/item/paper{ - name = "scribbled note"; - info = "you fucktards should clean your boots because lieutenant kotov made me scrub the deck clean with a toothbrush when i fucked up (wasnt my fault too) and BOY was it dirty. fuck you all though. know my struggles."; - pixel_y = 22; - icon_state = "paper_words" +/obj/structure/machinery/line_nexter{ + dir = 2; + icon_state = "turnstile_strata"; + layer = 4.1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" }, +/area/golden_arrow/canteen) +"yu" = ( +/obj/structure/surface/rack, +/obj/item/device/motiondetector/hacked, +/obj/item/ammo_magazine/sentry/upp, +/obj/item/defenses/handheld/sentry/upp, /turf/open/floor/strata{ icon_state = "floor2" }, -/area/golden_arrow/briefing) +/area/golden_arrow/squad_one) +"yz" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + desc = "The MinZdrav Blood Pack Dispensary is the premier, top-of-the-line blood dispenser of 2105! Get yours today!"; + name = "\improper MinZdrav Blood Dispenser"; + req_access = list(); + vendor_theme = 3 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "yH" = ( /turf/closed/wall/strata_outpost/reinforced, /area/golden_arrow/hangar) +"yS" = ( +/obj/structure/largecrate, +/obj/structure/largecrate{ + layer = 3.1; + pixel_x = 11; + pixel_y = 16 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/supply) "yY" = ( /obj/structure/surface/rack, /obj/item/device/motiondetector, @@ -2654,17 +2542,6 @@ icon_state = "floor2" }, /area/golden_arrow/hangar) -"zt" = ( -/obj/item/prop/colony/used_flare, -/obj/item/prop/colony/used_flare{ - pixel_y = 10; - pixel_x = 9 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/hangar) "zA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -2684,6 +2561,16 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) +"zT" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) "zU" = ( /obj/structure/machinery/light{ dir = 4 @@ -2709,6 +2596,25 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating, /area/golden_arrow/engineering) +"Ag" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/reagent_container/food/snacks/upp, +/obj/item/reagent_container/food/snacks/upp{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/upp{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/head/uppcap/civi{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) "Aj" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/paper_bin, @@ -2743,25 +2649,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/synthcloset) -"AA" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice4"; - pixel_y = 10; - pixel_x = -19 - }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 4; - icon_state = "lattice-simple"; - pixel_y = 10; - pixel_x = 13 - }, -/turf/open/floor/plating, -/area/golden_arrow/prep_hallway) "AC" = ( /obj/structure/machinery/light, /obj/structure/pipes/vents/pump{ @@ -2788,27 +2675,7 @@ }, /turf/open/floor/plating, /area/golden_arrow/cryo_cells) -"AW" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/reagent_container/food/drinks/coffee, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/canteen) -"Bf" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice8"; - pixel_y = 10; - pixel_x = 13 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/briefing) -"Bi" = ( +"AU" = ( /obj/structure/surface/rack, /obj/structure/machinery/light, /obj/item/storage/pouch/shotgun/large, @@ -2824,6 +2691,14 @@ icon_state = "floor2" }, /area/golden_arrow/squad_one) +"AW" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/reagent_container/food/drinks/coffee, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/canteen) "Bj" = ( /obj/structure/sink{ dir = 4; @@ -2836,18 +2711,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/platoon_commander_rooms) -"Bs" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/prep_hallway) "Bw" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Platoon Sergeant's Bunk"; @@ -2898,43 +2761,51 @@ }, /obj/item/clothing/shoes/marine/upp, /obj/item/clothing/under/marine/veteran/UPP, -/obj/item/device/radio/headset/distress/UPP, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/cryo_cells) -"BQ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/prop/almayer/CICmap{ - density = 0; - icon_state = "shuttle"; - layer = 2.97; - name = "Tactical Map Display"; - pixel_x = 7; - faction = "UPP"; - minimap_type = 8 - }, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - pixel_x = -12; - network = list("Chapaev","Vehicle") +/obj/item/device/radio/headset/distress/UPP, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" }, -/obj/structure/phone_base/no_dnd{ - pixel_y = 30; - name = "Overwatch Telephone"; - phone_id = "Overwatch"; - phone_category = "Command" +/area/golden_arrow/cryo_cells) +"BM" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 13; + pixel_y = 10 }, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/platoon_commander_rooms) +/area/golden_arrow/prep_hallway) "Ce" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 17" }, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"Cf" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/large_shrapnel/at_rocket_dud{ + drop_sensitivity = 0; + impact_sensitivity = 1; + pixel_x = -6; + pixel_y = 13 + }, +/obj/item/attachable/bayonet/upp{ + pixel_x = -9; + pixel_y = -1 + }, +/obj/item/prop/magazine/book{ + desc = "A booklet provided to anyone ranging from conscripts to normal citizenry. The first page is stamped with the Party's insignia and reminds you that the Party has your best interest in heart; the following pages immensely simplify the Party's doctrine, grossly propagandizes Socialism, and greatly vilifies the United Americas."; + name = "UPP Party Doctrine Booklet"; + pixel_x = 13 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) "Cg" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/upp, /turf/open/floor/strata{ @@ -3078,6 +2949,15 @@ icon_state = "floor3" }, /area/golden_arrow/prep_hallway) +"CU" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/gun_rack/type71/unloaded, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_one) "CW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/belt/utility/full, @@ -3113,21 +2993,35 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"Dr" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/pen{ - pixel_x = 12 +"Dw" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/obj/item/paper_bin, -/obj/item/device/flashlight/lamp{ - pixel_y = 12; - pixel_x = 11 +/obj/structure/prop/ice_colony/tiger_rug{ + desc = "A rather tasteless but impressive tiger rug. Must've costed a fortune to get this exported to the rim. Actually, this rug was 'collectivized' by internal police troopers during anti-corruption raids on colonies and later gifted to Leytenant."; + icon_state = "Gray"; + pixel_x = -14; + pixel_y = -14 }, -/obj/item/prop/magazine/book/theartofwar, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 6; + icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) +"DC" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "DE" = ( /obj/structure/machinery/light{ dir = 8; @@ -3159,27 +3053,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"DN" = ( -/obj/structure/surface/rack, -/obj/item/device/motiondetector/hacked, -/obj/item/ammo_magazine/sentry/upp, -/obj/item/defenses/handheld/sentry/upp, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_one) -"DW" = ( -/obj/structure/machinery/floodlight/landing/floor, -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/hangar) "DX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -3208,25 +3081,6 @@ icon_state = "floor3" }, /area/golden_arrow/squad_one) -"Ev" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/reagent_container/food/snacks/upp, -/obj/item/reagent_container/food/snacks/upp{ - pixel_y = 4; - pixel_x = 6 - }, -/obj/item/reagent_container/food/snacks/upp{ - pixel_y = 7; - pixel_x = -4 - }, -/obj/item/clothing/head/uppcap/civi{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/dorms) "Ez" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/landmark/late_join/alpha, @@ -3301,29 +3155,6 @@ icon_state = "floor2" }, /area/golden_arrow/hangar) -"Fh" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating, -/area/golden_arrow/briefing) -"Fi" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/prop/magazine/book{ - name = "UPP Party Doctrine Booklet"; - desc = "A booklet provided to anyone ranging from conscripts to normal citizenry. The first page is stamped with the Party's insignia and reminds you that the Party has your best interest in heart; the following pages immensely simplify the Party's doctrine, grossly propagandizes Socialism, and greatly vilifies the United Americas."; - pixel_x = 1; - pixel_y = 6 - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/canteen) "Fl" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -3358,6 +3189,34 @@ icon_state = "multi_tiles" }, /area/golden_arrow/cryo_cells) +"Fv" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp/on{ + pixel_y = 13 + }, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ + pixel_x = -9; + pixel_y = 2 + }, +/obj/item/trash/semki, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/platoon_sergeant) +"Fz" = ( +/obj/structure/closet/secure_closet{ + name = "squad sergeant locker"; + req_access_txt = "244;237" + }, +/obj/item/clothing/accessory/armband, +/obj/item/device/whistle, +/obj/item/device/binoculars/range/designator, +/obj/item/weapon/gun/rifle/type71/flamer, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_one) "FB" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -3389,27 +3248,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/prep_hallway) -"FG" = ( -/obj/structure/machinery/cm_vending/clothing/synth{ - density = 0; - pixel_y = 32; - name = "\improper UnTech Synthetic Equipment Rack" - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/synthcloset) -"FH" = ( -/obj/structure/machinery/door/airlock/almayer/maint/colony{ - name = "\improper Dorms"; - dir = 1; - req_one_access = null - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/dorms) "FV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ @@ -3452,27 +3290,17 @@ icon_state = "floor2" }, /area/golden_arrow/hangar) -"Gt" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/large_shrapnel/at_rocket_dud{ - pixel_y = 13; - pixel_x = -6; - drop_sensitivity = 0; - impact_sensitivity = 1 - }, -/obj/item/attachable/bayonet/upp{ - pixel_y = -1; - pixel_x = -9 - }, -/obj/item/prop/magazine/book{ - name = "UPP Party Doctrine Booklet"; - desc = "A booklet provided to anyone ranging from conscripts to normal citizenry. The first page is stamped with the Party's insignia and reminds you that the Party has your best interest in heart; the following pages immensely simplify the Party's doctrine, grossly propagandizes Socialism, and greatly vilifies the United Americas."; - pixel_x = 13 +"Gn" = ( +/obj/structure/machinery/cm_vending/clothing/synth{ + density = 0; + name = "\improper UnTech Synthetic Equipment Rack"; + pixel_y = 32 }, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 6; + icon_state = "multi_tiles" }, -/area/golden_arrow/dorms) +/area/golden_arrow/synthcloset) "Gw" = ( /obj/structure/machinery/power/apc/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -3518,6 +3346,15 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) +"GT" = ( +/obj/structure/surface/rack, +/obj/item/device/motiondetector/hacked, +/obj/item/ammo_magazine/sentry/upp, +/obj/item/defenses/handheld/sentry/upp, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_two) "GU" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata{ @@ -3608,29 +3445,21 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) -"HO" = ( -/obj/structure/largecrate, -/obj/structure/largecrate{ - pixel_y = 16; - pixel_x = 11; - layer = 3.1 +"HN" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper_bin, +/obj/item/tool/pen{ + pixel_x = 12 + }, +/obj/item/prop/tableflag/upp{ + pixel_x = 6; + pixel_y = 15 }, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" }, -/area/golden_arrow/supply) -"HX" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 1 - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/canteen) +/area/golden_arrow/briefing) "Id" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -3638,17 +3467,16 @@ }, /turf/open/floor/plating, /area/golden_arrow/briefing) -"Io" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - id = "Delta_1"; - name = "\improper Bathroom"; - dir = 2 +"Ii" = ( +/obj/structure/janitorialcart, +/obj/item/reagent_container/glass/bucket{ + pixel_x = -7; + pixel_y = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/turf/open/floor/strata{ + icon_state = "floor2" }, -/area/golden_arrow/dorms) +/area/golden_arrow/briefing) "IB" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -3678,6 +3506,21 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) +"Je" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/reagent_container/food/drinks/tea{ + pixel_x = -8; + pixel_y = -1 + }, +/obj/item/ashtray/bronze{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/canteen) "Jf" = ( /turf/open/floor/strata{ dir = 4; @@ -3711,24 +3554,10 @@ "Jt" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/plating, -/area/golden_arrow/squad_two) -"Ju" = ( -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/obj/structure/machinery/line_nexter{ - icon_state = "turnstile_strata"; - dir = 2; - layer = 4.1 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + dir = 8 }, -/area/golden_arrow/canteen) +/turf/open/floor/plating, +/area/golden_arrow/squad_two) "JA" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/prop/invuln/overhead_pipe, @@ -3737,6 +3566,15 @@ }, /turf/open/floor/plating, /area/golden_arrow/engineering) +"JB" = ( +/obj/structure/cargo_container/horizontal/blue/top{ + opacity = 0; + pixel_x = 17 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/hangar) "JE" = ( /obj/structure/pipes/standard/cap/hidden/supply{ dir = 4 @@ -3771,19 +3609,6 @@ icon_state = "cyan1" }, /area/golden_arrow/medical) -"JR" = ( -/obj/structure/machinery/computer/overwatch/almayer{ - faction = "UPP"; - density = 1 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_x = 7; - pixel_y = 17 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/platoon_commander_rooms) "JW" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Canteen"; @@ -3804,16 +3629,6 @@ icon_state = "floor3" }, /area/golden_arrow/prep_hallway) -"Ka" = ( -/obj/structure/machinery/chem_master, -/obj/item/storage/box/pillbottles{ - pixel_y = 12 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "cyan1" - }, -/area/golden_arrow/medical) "Kc" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, @@ -3860,21 +3675,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"KG" = ( -/obj/structure/machinery/chem_dispenser{ - desc = "A complex machine for mixing elements into chemicals. A MinZdrav product." - }, -/obj/item/reagent_container/glass/beaker/bluespace{ - pixel_y = 17 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "cyan1" - }, -/area/golden_arrow/medical) "KH" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -3899,28 +3699,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/briefing) -"KT" = ( -/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access{ - desc = "Medical chemistry dispenser. Provided by Ministry of Health of UPP."; - name = "\improper MinZdrav Chem"; - vendor_theme = 3 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "cyan1" - }, -/area/golden_arrow/medical) -"KV" = ( -/obj/structure/prop{ - icon_state = "ladder11"; - name = "ladder"; - desc = "A sturdy metal ladder that leads to lower deck of Chapaev which houses CIC and Brig. The hatch is closed, for now." - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/briefing) "Lf" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/structure/machinery/light{ @@ -3946,15 +3724,52 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"Lm" = ( +"Ln" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/cameras/wooden_tv/prop{ + pixel_y = 12 + }, +/obj/item/toy/deck{ + pixel_x = 9; + pixel_y = -6 + }, +/obj/item/tool/wrench{ + pixel_y = 25 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) +"Lt" = ( +/obj/structure/machinery/power/terminal{ + dir = 8 + }, +/obj/effect/decal/strata_decals/catwalk/prison{ + pixel_x = 20; + pixel_y = -1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/golden_arrow/engineering) +"Lw" = ( /obj/structure/closet/secure_closet{ - req_access_txt = "244;238"; - name = "squad sergeant locker" + name = "machinegunner locker"; + req_access_txt = "243;238" }, -/obj/item/clothing/accessory/armband, -/obj/item/device/whistle, -/obj/item/device/binoculars/range/designator, -/obj/item/weapon/gun/rifle/type71/flamer, +/obj/item/ammo_magazine/pkp, +/obj/item/ammo_magazine/pkp, +/obj/item/ammo_magazine/pkp, +/obj/item/ammo_magazine/pkp, +/obj/item/ammo_magazine/pkp, +/obj/item/ammo_magazine/pkp, +/obj/item/ammo_magazine/pkp, +/obj/item/storage/belt/gun/smartgunner/upp, +/obj/item/storage/belt/marine/smartgunner/upp, +/obj/item/clothing/suit/storage/marine/smartgunner/upp, +/obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, +/obj/item/weapon/gun/pkp/iff, /turf/open/floor/strata{ icon_state = "floor2" }, @@ -4033,24 +3848,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_commander_rooms) -"MF" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - pixel_y = 18; - pixel_x = 2; - density = 0 - }, -/obj/item/book/codebook/upp, -/obj/item/prop/magazine/book{ - desc = "It's not a mandatory reading material in UPP, but it's still encouraged to memorize certain quotes from this book."; - name = "Communist Manifesto"; - pixel_y = 35 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/platoon_sergeant) "MH" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4076,6 +3873,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating, /area/golden_arrow/prep_hallway) +"MR" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/golden_arrow/medical) "MV" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -4091,6 +3897,34 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) +"MX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/secure_closet/marine_personal{ + has_cryo_gear = 0; + job = "Smartgunner" + }, +/obj/item/clothing/shoes/marine/upp, +/obj/item/clothing/under/marine/veteran/UPP, +/obj/item/device/radio/headset/distress/UPP, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/cryo_cells) "MZ" = ( /obj/structure/machinery/light{ dir = 1 @@ -4100,6 +3934,18 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) +"Nd" = ( +/obj/item/tool/soap, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/cryo_cells) "Nz" = ( /obj/structure/machinery/light{ dir = 8 @@ -4122,6 +3968,21 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) +"NF" = ( +/obj/item/tool/mop{ + pixel_x = 17; + pixel_y = -2 + }, +/obj/item/paper{ + icon_state = "paper_words"; + info = "you fucktards should clean your boots because lieutenant kotov made me scrub the deck clean with a toothbrush when i fucked up (wasnt my fault too) and BOY was it dirty. fuck you all though. know my struggles."; + name = "scribbled note"; + pixel_y = 22 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/briefing) "NI" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 1; @@ -4148,19 +4009,32 @@ "Of" = ( /turf/closed/wall/strata_outpost/reinforced, /area/space) -"Ol" = ( -/obj/structure/machinery/power/terminal{ - dir = 8 +"Og" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "\improper Squad One Armoury"; + req_one_access = null; + req_one_access_txt = "231;240;237" }, -/obj/effect/decal/strata_decals/catwalk/prison{ - pixel_y = -1; - pixel_x = 20 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-4" +/turf/open/floor/strata{ + icon_state = "floor2" }, -/turf/open/floor/plating, -/area/golden_arrow/engineering) +/area/golden_arrow/squad_one) +"Oo" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 1; + name = "\improper Platoon Medic Office"; + req_one_access = null; + req_one_access_txt = "231" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/medical) "Os" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Platoon Commander's Quarters"; @@ -4174,6 +4048,18 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) +"Ov" = ( +/obj/structure/machinery/cm_vending/gear/synth{ + density = 0; + name = "\improper UnTech Synthetic Auxiliary Gear Rack"; + pixel_y = 32 + }, +/obj/item/stool, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/synthcloset) "OB" = ( /obj/structure/machinery/disposal, /turf/open/floor/strata{ @@ -4198,32 +4084,12 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/golden_arrow/supply) -"OL" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_two) "OP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ icon_state = "floor2" }, /area/golden_arrow/dorms) -"OR" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/paper/crumpled/bloody{ - pixel_y = 6 - }, -/obj/item/attachable/bayonet/upp, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_one) "OX" = ( /turf/open/floor/strata{ icon_state = "floor2" @@ -4289,42 +4155,23 @@ icon_state = "floor3" }, /area/golden_arrow/hangar) -"Qb" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/reagent_container/food/snacks/upp{ - pixel_y = -7; - pixel_x = -10 - }, -/obj/item/reagent_container/food/snacks/upp{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/item/reagent_container/food/snacks/upp{ - pixel_x = -7; - pixel_y = -2 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/briefing) -"Qd" = ( -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +"PR" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 1; + name = "ship-grade camera"; + network = list("Chapaev") }, -/area/golden_arrow/dorms) -"Qi" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice8"; - pixel_y = 10; - pixel_x = 13 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" +/turf/open/floor/plating, +/area/golden_arrow/cryo_cells) +"Qd" = ( +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/area/golden_arrow/prep_hallway) +/area/golden_arrow/dorms) "Qj" = ( /obj/structure/machinery/cryopod, /turf/open/floor/strata{ @@ -4363,6 +4210,27 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) +"QJ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + id = "Delta_1"; + name = "\improper Bathroom" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/dorms) +"QK" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper/crumpled/bloody{ + pixel_y = 6 + }, +/obj/item/attachable/bayonet/upp, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_one) "QR" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, @@ -4377,28 +4245,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/synthcloset) -"QY" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/light{ - dir = 4; - invisibility = 101 - }, -/obj/item/clothing/head/uppcap/beret{ - pixel_y = 8; - pixel_x = -6 - }, -/obj/item/clothing/accessory/armband{ - pixel_x = 6 - }, -/obj/item/tool/screwdriver{ - pixel_y = 8; - pixel_x = -9 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/platoon_sergeant) "Re" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/strata_decals/catwalk/prison, @@ -4414,6 +4260,21 @@ icon_state = "multi_tiles" }, /area/golden_arrow/platoon_sergeant) +"Rs" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/machinery/light/small, +/obj/item/prop/magazine/book{ + desc = "A booklet provided to anyone ranging from conscripts to normal citizenry. The first page is stamped with the Party's insignia and reminds you that the Party has your best interest in heart; the following pages immensely simplify the Party's doctrine, grossly propagandizes Socialism, and greatly vilifies the United Americas."; + name = "UPP Party Doctrine Booklet"; + pixel_x = 11; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/dorms) "Ru" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ammo_magazine/pistol/np92, @@ -4453,15 +4314,39 @@ icon_state = "floor3" }, /area/golden_arrow/medical) -"RF" = ( -/obj/structure/machinery/light{ - dir = 1 +"RI" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/prop/magazine/book{ + name = "UPP Party Doctrine Booklet" + }, +/obj/item/prop/tableflag/upp{ + pixel_x = 6; + pixel_y = 1 }, -/obj/structure/gun_rack/type71/unloaded, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/squad_one) +/area/golden_arrow/briefing) +"RJ" = ( +/obj/item/clothing/suit/storage/snow_suit/soviet, +/obj/item/clothing/suit/gimmick/jason, +/obj/structure/closet/secure_closet/marine_personal{ + has_cryo_gear = 0; + icon_broken = "cabinetdetective_broken"; + icon_closed = "cabinetdetective"; + icon_locked = "cabinetdetective_locked"; + icon_off = "cabinetdetective_broken"; + icon_opened = "cabinetdetective_open"; + icon_state = "cabinetdetective_locked"; + job = "Platoon Commander" + }, +/obj/item/clothing/under/marine/veteran/UPP/boiler, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/platoon_commander_rooms) "RN" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ name = "ship-grade camera"; @@ -4480,47 +4365,57 @@ icon_state = "floor2" }, /area/golden_arrow/platoon_commander_rooms) +"RU" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_x = 13; + pixel_y = 10 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -19; + pixel_y = 10 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/golden_arrow/briefing) "Sc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"Se" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/medical) -"Sf" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ammo_magazine/handful/shotgun/heavy/flechette{ - current_rounds = 1; - pixel_y = 6; - pixel_x = 7 - }, -/obj/item/ammo_magazine/handful/shotgun/heavy{ - pixel_y = 5; - current_rounds = 1 - }, -/obj/item/ammo_magazine/handful/shotgun/heavy/beanbag{ - pixel_y = 5; - pixel_x = -8; - current_rounds = 1 +"Sj" = ( +/obj/structure/machinery/door_control{ + id = "chapaev_engi"; + pixel_y = -23 }, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 6; + icon_state = "multi_tiles" }, -/area/golden_arrow/squad_two) +/area/golden_arrow/engineering) "Sp" = ( /obj/item/clothing/head/helmet/marine/veteran/bear{ anchored = 1 }, /turf/closed/wall/strata_outpost/reinforced/hull, /area/golden_arrow/platoon_sergeant) +"Sv" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_x = 13; + pixel_y = 10 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/golden_arrow/prep_hallway) "Sx" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -4528,6 +4423,28 @@ }, /turf/open/floor/plating, /area/golden_arrow/prep_hallway) +"Sz" = ( +/obj/structure/machinery/body_scanconsole{ + dir = 1; + pixel_y = 6 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/golden_arrow/medical) +"SB" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 13; + pixel_y = 10 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/golden_arrow/briefing) "SF" = ( /obj/structure/machinery/computer/station_alert{ dir = 8; @@ -4572,6 +4489,24 @@ icon_state = "floor2" }, /area/golden_arrow/briefing) +"SU" = ( +/obj/structure/bookcase{ + density = 0; + icon_state = "book-5"; + pixel_x = 2; + pixel_y = 18 + }, +/obj/item/book/codebook/upp, +/obj/item/prop/magazine/book{ + desc = "It's not a mandatory reading material in UPP, but it's still encouraged to memorize certain quotes from this book."; + name = "Communist Manifesto"; + pixel_y = 35 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/platoon_sergeant) "Tb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4584,17 +4519,6 @@ "Tf" = ( /turf/closed/wall/strata_outpost/reinforced, /area/golden_arrow/platoon_sergeant) -"Tg" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/prep_hallway) "Tk" = ( /obj/structure/machinery/light{ dir = 4 @@ -4626,50 +4550,12 @@ icon_state = "floor2" }, /area/golden_arrow/squad_two) -"Tx" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/cryo_cells) -"Tz" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/cameras/wooden_tv/prop{ - pixel_y = 12 - }, -/obj/item/toy/deck{ - pixel_y = -6; - pixel_x = 9 - }, -/obj/item/tool/wrench{ - pixel_y = 25 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/dorms) "TB" = ( /turf/open/floor/strata{ dir = 6; icon_state = "multi_tiles" }, /area/golden_arrow/platoon_commander_rooms) -"TF" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - name = "ship-grade camera"; - network = list("Chapaev"); - dir = 8 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/squad_one) "TH" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -4691,18 +4577,6 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) -"Ua" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 4; - icon_state = "lattice-simple"; - pixel_y = 10; - pixel_x = 13 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "multi_tiles" - }, -/area/golden_arrow/prep_hallway) "Ug" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4712,6 +4586,17 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) +"Ul" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 1; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/canteen) "Un" = ( /obj/structure/machinery/disposal, /turf/open/floor/strata{ @@ -4719,6 +4604,19 @@ icon_state = "multi_tiles" }, /area/golden_arrow/briefing) +"Up" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/prop/magazine/book{ + desc = "A booklet provided to anyone ranging from conscripts to normal citizenry. The first page is stamped with the Party's insignia and reminds you that the Party has your best interest in heart; the following pages immensely simplify the Party's doctrine, grossly propagandizes Socialism, and greatly vilifies the United Americas."; + name = "UPP Party Doctrine Booklet"; + pixel_x = 1; + pixel_y = 6 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/canteen) "Uu" = ( /obj/structure/machinery/conveyor, /obj/structure/machinery/conveyor{ @@ -4814,18 +4712,6 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) -"Vk" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/item/tool/hand_labeler{ - pixel_y = 3; - pixel_x = 3 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/dorms) "Vq" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 1; @@ -4838,6 +4724,22 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) +"VE" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light, +/obj/item/storage/pouch/shotgun/large, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot/special, +/obj/item/weapon/gun/shotgun/type23/pve, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_two) "VH" = ( /obj/structure/platform/strata/metal{ dir = 1; @@ -4876,43 +4778,6 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) -"VP" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/prop/ice_colony/tiger_rug{ - pixel_x = -14; - pixel_y = -14; - icon_state = "Gray"; - desc = "A rather tasteless but impressive tiger rug. Must've costed a fortune to get this exported to the rim. Actually, this rug was 'collectivized' by internal police troopers during anti-corruption raids on colonies and later gifted to Leytenant." - }, -/turf/open/floor/strata{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/golden_arrow/platoon_commander_rooms) -"VX" = ( -/obj/structure/machinery/washing_machine, -/obj/structure/machinery/washing_machine{ - layer = 3.5; - pixel_y = 15 - }, -/obj/item/toy/plush/therapy/green{ - pixel_x = 1; - name = "Polkovnik Obnimashkin"; - desc = "He seems lonely..."; - pixel_y = 26; - layer = 3.6 - }, -/obj/item/clothing/head/uppcap/ushanka{ - pixel_y = 30; - pixel_x = 1; - layer = 3.6 - }, -/turf/open/floor/strata{ - icon_state = "floor2" - }, -/area/golden_arrow/dorms) "VZ" = ( /obj/structure/machinery/power/smes/buildable, /obj/structure/machinery/camera/autoname/golden_arrow{ @@ -4928,19 +4793,18 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating, /area/golden_arrow/briefing) -"Wg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/maint/colony{ - name = "\improper Platoon Medic Office"; - req_one_access = null; - req_one_access_txt = "231"; - dir = 1 +"Wk" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera"; + network = list("Chapaev") }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + dir = 8; + icon_state = "multi_tiles" }, -/area/golden_arrow/medical) +/area/golden_arrow/prep_hallway) "Wp" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/beetsoup, @@ -4974,17 +4838,6 @@ /obj/structure/prop/invuln/overhead_pipe, /turf/open/floor/plating, /area/golden_arrow/engineering) -"WM" = ( -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 20; - pixel_x = -23 - }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 10; - pixel_x = -31 - }, -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/golden_arrow/hangar) "WP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -5013,6 +4866,46 @@ icon_state = "floor3" }, /area/golden_arrow/cryo_cells) +"WR" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/prop/almayer/CICmap{ + density = 0; + faction = "UPP"; + icon_state = "shuttle"; + layer = 2.97; + minimap_type = 8; + name = "Tactical Map Display"; + pixel_x = 7 + }, +/obj/structure/machinery/computer/cameras/almayer/vehicle{ + network = list("Chapaev","Vehicle"); + pixel_x = -12 + }, +/obj/structure/phone_base/no_dnd{ + name = "Overwatch Telephone"; + phone_category = "Command"; + phone_id = "Overwatch"; + pixel_y = 30 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/platoon_commander_rooms) +"WU" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper_bin, +/obj/item/tool/pen{ + pixel_x = 12 + }, +/obj/item/tool/hand_labeler{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/platoon_sergeant) "WV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5022,6 +4915,21 @@ icon_state = "floor3" }, /area/golden_arrow/platoon_sergeant) +"WW" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + name = "ship-grade camera"; + network = list("Chapaev") + }, +/obj/structure/machinery/cm_vending/clothing/medic/upp, +/obj/item/clothing/head/uppcap{ + pixel_x = 8; + pixel_y = 11 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/medical) "WY" = ( /obj/structure/closet/crate/ammo/alt/flame, /obj/item/explosive/grenade/high_explosive/upp, @@ -5100,46 +5008,46 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) -"Xt" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/machinery/light/small{ - dir = 1 +"Xp" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/reagent_container/food/snacks/upp{ + pixel_x = -10; + pixel_y = -7 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/item/reagent_container/food/snacks/upp{ + pixel_x = -1; + pixel_y = 2 }, -/area/golden_arrow/dorms) -"XC" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap"; - layer = 2.5; - dir = 4 +/obj/item/reagent_container/food/snacks/upp{ + pixel_x = -7; + pixel_y = -2 }, -/obj/structure/platform/strata/metal{ - dir = 8 +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" }, -/obj/structure/machinery/light{ - dir = 4 +/area/golden_arrow/briefing) +"Xq" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/office/dark, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" }, -/area/golden_arrow/briefing) -"XH" = ( -/obj/structure/janitorialcart, -/obj/item/reagent_container/glass/bucket{ - pixel_y = 8; - pixel_x = -7 +/area/golden_arrow/medical) +"Xt" = ( +/obj/structure/toilet{ + dir = 4 }, -/turf/open/floor/strata{ - icon_state = "floor2" +/obj/structure/machinery/light/small{ + dir = 1 }, -/area/golden_arrow/briefing) +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/dorms) "XL" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -5159,6 +5067,40 @@ icon_state = "floor3" }, /area/golden_arrow/briefing) +"XY" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/golden_arrow/briefing) +"Yh" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/platoon_commander_rooms) +"Yk" = ( +/obj/structure/closet/secure_closet{ + name = "squad sergeant locker"; + req_access_txt = "244;238" + }, +/obj/item/clothing/accessory/armband, +/obj/item/device/whistle, +/obj/item/device/binoculars/range/designator, +/obj/item/weapon/gun/rifle/type71/flamer, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/squad_two) "Yo" = ( /obj/structure/closet, /obj/item/clothing/head/uppcap/civi{ @@ -5169,6 +5111,18 @@ icon_state = "floor2" }, /area/golden_arrow/dorms) +"Yq" = ( +/obj/structure/machinery/cryopod, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/golden_arrow/cryo_cells) "YA" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -5254,6 +5208,17 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) +"Zp" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 1; + name = "ship-grade camera"; + network = list("Chapaev") + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/golden_arrow/platoon_sergeant) "Zv" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -5272,6 +5237,18 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) +"ZM" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/golden_arrow/dorms) "ZN" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 5" @@ -5281,27 +5258,19 @@ icon_state = "floor3" }, /area/golden_arrow/engineering) -"ZQ" = ( -/obj/structure/closet/secure_closet{ - req_access_txt = "243;237"; - name = "machinegunner locker" +"ZT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 2; + name = "\improper Platoon Sergeant's Bunk"; + req_one_access = null; + req_one_access_txt = "240" }, -/obj/item/ammo_magazine/pkp, -/obj/item/ammo_magazine/pkp, -/obj/item/ammo_magazine/pkp, -/obj/item/ammo_magazine/pkp, -/obj/item/ammo_magazine/pkp, -/obj/item/ammo_magazine/pkp, -/obj/item/ammo_magazine/pkp, -/obj/item/storage/belt/gun/smartgunner/upp, -/obj/item/storage/belt/marine/smartgunner/upp, -/obj/item/clothing/suit/storage/marine/smartgunner/upp, -/obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, -/obj/item/weapon/gun/pkp/iff, /turf/open/floor/strata{ - icon_state = "floor2" + dir = 4; + icon_state = "floor3" }, -/area/golden_arrow/squad_one) +/area/golden_arrow/platoon_sergeant) "ZU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11777,7 +11746,7 @@ hE hE Sp hE -MF +SU tG WZ tG @@ -11928,7 +11897,7 @@ hE hE UZ FV -tL +ZT FV fc lE @@ -12077,14 +12046,14 @@ mV mV mV hE -xO +Fv tG dF Tf OB WV -QY -aI +pR +ha tV hE mV @@ -12529,7 +12498,7 @@ tZ tZ tZ ei -OR +QK dU dU dU @@ -12539,7 +12508,7 @@ vW vW PL Rm -mv +Zp NU Tw Hp @@ -12678,29 +12647,29 @@ tZ tZ tZ tZ -eF +nH Qj ww -pz +jI dU xZ dU EO ww MZ -qQ +WU EM Ru eD NU -Sf +lP Hp ML Hp yY CM -VX -kB +ab +zT bt Nz Yo @@ -12827,17 +12796,17 @@ Ms MC os CZ -jH +mh os -kb +RJ ic Jc ww -RF +CU dU Ef dU -Bi +AU ww QF hq @@ -12845,13 +12814,13 @@ hq vf vW NU -tS +pw Hp XL Hp -jV +VE CM -Gt +Cf Qr bt oH @@ -12980,16 +12949,16 @@ MC os Bx uQ -rG +Yh TB -VP +Dw TB ww -ZQ +ua dU MH dU -DN +yu ww LL vW @@ -12997,13 +12966,13 @@ es Rm vW NU -ud +Lw Hp Jt Hp -gl +GT CM -Tz +Ln Qr oH Ku @@ -13137,10 +13106,10 @@ uA zU Ar ww -uS +Fz mT Mm -TF +vo eo ww Hf @@ -13149,21 +13118,21 @@ zb vQ sy NU -Lm -OL +Yk +fE bc hV WY CM -Ev -Vk +Ag +ZM bt pH bt CM Xt CM -io +Rs IS mV mV @@ -13291,7 +13260,7 @@ os ww ww ww -py +Og ww ww ww @@ -13453,18 +13422,18 @@ NA MO Ma Ma -Bs -AA +Wk +nF Sx MO dx LO -FH +jr OP OP SO OP -Io +QJ oi tH Qd @@ -13570,12 +13539,12 @@ Jf Jf Jf iz -zt +gX tx cW cW cW -gZ +rq cW cW cW @@ -13586,16 +13555,16 @@ zA yH Ms os -BQ +WR un -Dr +qc RP rl qm Ma Ma Ki -Tg +vS bK EP bK @@ -13606,7 +13575,7 @@ bK bK bK bK -Ua +Sv bK bK bK @@ -13738,7 +13707,7 @@ MN yH Ms os -JR +rQ OX ob KK @@ -13758,7 +13727,7 @@ cT cT Xh Xh -Qi +BM JX mB mB @@ -13902,7 +13871,7 @@ cT aE wB DK -Fi +Up UM nO Tb @@ -14048,17 +14017,17 @@ xD xD cv PJ -rJ +gh cT tq Zv af DK Wp -kS +Je nO EA -HX +Ul cT BK BK @@ -14070,9 +14039,9 @@ pk AS AS AS -sL +Nd iO -Tx +Yq jS hx jS @@ -14364,11 +14333,11 @@ qK Fp jg cT -aQ +ga cR eB cR -bO +PR iO AC iO @@ -14498,7 +14467,7 @@ KD PE KN PJ -lS +HN VH bg xD @@ -14554,7 +14523,7 @@ ug vb wO FY -Ol +Lt wy jG mV @@ -14648,9 +14617,9 @@ wq wq MN fh -bm +tk Xl -XC +lu dA cU xD @@ -14659,7 +14628,7 @@ PJ Ll cT tq -Ju +yq af DK uE @@ -14672,9 +14641,9 @@ BK BK wH VL -vi +MX iO -bC +eH CJ CJ CJ @@ -14854,7 +14823,7 @@ vb Jr ug CW -wN +Sj vb wO fA @@ -14975,8 +14944,8 @@ cT lN DE CC -pU -Qb +jp +Xp Ht Un vN @@ -15089,7 +15058,7 @@ Jf ED Jf Jf -DW +qU Jf tx cW @@ -15117,7 +15086,7 @@ ts CI ts ts -cd +RU ts ts CI @@ -15131,7 +15100,7 @@ cQ ts HI FZ -hr +dn ur ur Ao @@ -15267,16 +15236,16 @@ PJ nc bN bN -Fh +cL FZ -Bf +SB FZ FZ bN Wf bN FZ -cX +XY bN bN bN @@ -15401,7 +15370,7 @@ KB KB KB yH -qu +jR KB KB KB @@ -15412,10 +15381,10 @@ xK fh dH nI -xY +RI PJ fh -KV +kn wV wV pX @@ -15553,7 +15522,7 @@ KB KB KB yH -gv +mN KB ag KB @@ -15574,24 +15543,24 @@ Ax TJ wV nv -eb +DC tX Jq ZU -sO +yz ff CK -pb DH -YL +DH +nq CK Qv kh vN vN -cC -cC -cC +he +he +he vN Tr Tr @@ -15709,7 +15678,7 @@ YZ hH cg KB -pV +ew yH Dh xK @@ -15721,7 +15690,7 @@ fh fh Dh wV -lK +Ov Ax mm wV @@ -15732,15 +15701,15 @@ TH as Sc Sc -Wg +Oo wx -Se -tn +Xq +YL CK -ys +NF HA vN -oW +xv Jj Jj Jj @@ -15858,10 +15827,10 @@ KB KB yH xi -gu -pO -pL -dD +JB +di +tj +tP yH Dh xK @@ -15873,26 +15842,26 @@ Dh Dh Dh wV -FG +Gn Ax dV wV or DG -dr +Sz DG aa DG aa CK -pA -bf -rV +WW +DH +tn CK -XH +Ii SQ vN -HO +yS Li Li Li @@ -16037,9 +16006,9 @@ wA qO wA CK -KT -KG -Ka +bU +MR +rV CK IB IB @@ -16162,8 +16131,8 @@ mV mV mV oB -WM -jF +yc +lr oB oB mV diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index e01219f319..37c6f5290e 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -1,4 +1,21 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/squad_sergeant{ + name = "squad one sergeant locker"; + req_access_txt = "32;39"; + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/platoonprep) +"ae" = ( +/obj/structure/machinery/landinglight/ds1/delaythree, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "af" = ( /obj/effect/decal/strata_decals/grime/grime2{ dir = 8 @@ -9,6 +26,23 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) +"ai" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/airlock/almayer/secure{ + dir = 8; + name = "\improper Shared Office"; + req_access = list(); + req_one_access_txt = "12;32" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/shared_office) "aj" = ( /obj/structure/machinery/light{ dir = 1 @@ -54,20 +88,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"an" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/vending/walkman{ - pixel_y = 21; - pixel_x = 10; - density = 0 - }, -/obj/item/trash/kepler{ - pixel_x = 8; - pixel_y = 44 - }, -/obj/item/trash/barcardine, -/turf/open/floor/almayer, -/area/golden_arrow/dorms) "ar" = ( /obj/structure/machinery/light{ dir = 1 @@ -90,6 +110,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) +"av" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/storage/briefcase/inflatable{ + pixel_y = 10 + }, +/obj/item/storage/briefcase/inflatable{ + pixel_x = 3; + pixel_y = 5 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "aA" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8 @@ -107,6 +141,22 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"aC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/roller{ + pixel_y = 17 + }, +/obj/item/roller{ + pixel_y = 23 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "aD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -158,18 +208,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/dorms) -"aM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/storage{ - pixel_x = -18; - pixel_y = -7 - }, -/obj/structure/sign/safety/one{ - pixel_x = -18; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "aN" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -192,21 +230,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"aV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "aW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable/heavyduty{ @@ -283,19 +306,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/prep_hallway) -"bf" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - dir = 1 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -26 - }, -/obj/structure/sign/safety/one{ - pixel_x = 14; - pixel_y = -26 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) "bg" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -307,30 +317,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"bh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - name = "Maintenance Bay Blast Door"; - closed_layer = 3.3; - layer = 3.3; - open_layer = 3.3 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) -"bi" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/colony/game{ - pixel_y = 10; - pixel_x = 15 - }, -/turf/open/floor/almayer, -/area/golden_arrow/dorms) "bj" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -374,6 +360,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) +"bn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "bp" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -412,23 +407,40 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"bv" = ( +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = 27 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 14; + pixel_y = 27 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + layer = 3.6; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/hangar) "bx" = ( /turf/closed/wall/almayer, /area/golden_arrow/dorms) -"by" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"bB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/railing{ - dir = 2 +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "apc1blastdoor"; + name = "\improper Vehicle Bay One Blast Door" }, -/obj/item/tool/warning_cone{ - pixel_y = 16; - pixel_x = -15 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, /area/golden_arrow/hangar) "bC" = ( /obj/effect/decal/warning_stripes{ @@ -477,21 +489,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoonprep) -"bK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 14; - pixel_x = -4 - }, -/obj/item/ashtray/plastic{ - pixel_y = 3; - pixel_x = -10 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "bN" = ( /obj/structure/machinery/light{ dir = 1 @@ -522,23 +519,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"bS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/machinery/prop/almayer/CICmap{ - density = 0; - icon_state = "shuttle"; - layer = 2.97; - name = "Tactical Map Display"; - pixel_y = 21 - }, -/obj/structure/noticeboard{ - pixel_y = 30; - pixel_x = -21 - }, -/turf/open/floor/almayer, -/area/golden_arrow/briefing) "bT" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/almayer{ @@ -551,6 +531,23 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"bZ" = ( +/obj/structure/largecrate/supply/ammo{ + fill_from_loc = 1; + name = "sentry crate" + }, +/obj/item/ammo_magazine/sentry{ + layer = 3.01 + }, +/obj/item/defenses/handheld/sentry, +/obj/structure/largecrate/supply/explosives/grenades/less{ + icon_state = "case"; + layer = 3.1; + pixel_x = 20; + pixel_y = 10 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) "cb" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -567,6 +564,22 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"cd" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/soap{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/tool/soap{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/item/tool/soap/nanotrasen{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/golden_arrow/cryo_cells) "cf" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -612,31 +625,60 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"cn" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, +/obj/item/tool/soap/deluxe, +/obj/item/tool/soap{ + pixel_x = 3; + pixel_y = 15 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) "co" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ icon_state = "plate" }, /area/golden_arrow/hangar) -"cu" = ( +"cp" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/largecrate/random/case{ + pixel_y = 5 + }, +/obj/structure/largecrate/random/case/double{ + pixel_y = 15 + }, +/obj/structure/largecrate/random/case{ + pixel_y = -5 + }, +/obj/structure/largecrate/random/mini/small_case{ + layer = 3.1; + pixel_x = 8; + pixel_y = 14 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/golden_arrow/hangar) -"cv" = ( -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing1" +"cu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, /turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 + icon_state = "plate" }, /area/golden_arrow/hangar) "cx" = ( @@ -646,6 +688,25 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonprep) +"cy" = ( +/obj/item/trash/cigbutt{ + layer = 3.2; + pixel_x = 4; + pixel_y = 10; + randpixel = 0 + }, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + layer = 3.2; + pixel_x = -2; + pixel_y = 1 + }, +/obj/structure/largecrate/supply/weapons/pistols{ + layer = 3.1; + pixel_y = -7 + }, +/turf/closed/wall/almayer/outer, +/area/golden_arrow/hangar) "cB" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -663,6 +724,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"cF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control/brbutton{ + id = "squadblastdoor"; + name = "hangar blast door control"; + pixel_y = 28; + req_one_access_txt = "19;12" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/platoonarmory) +"cG" = ( +/obj/structure/ship_ammo/minirocket, +/obj/structure/ship_ammo/minirocket{ + layer = 3.1; + pixel_y = 9 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "cI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -679,6 +764,36 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) +"cK" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = -3; + pixel_y = 25; + randpixel = 0 + }, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/trash/cigbutt{ + pixel_x = 4; + pixel_y = 5; + randpixel = 0 + }, +/obj/item/prop/helmetgarb/gunoil{ + layer = 3.3; + pixel_x = 9; + pixel_y = 23 + }, +/obj/item/storage/fancy/cigar/matchbook{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/platoonprep) "cM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable{ @@ -689,6 +804,34 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) +"cN" = ( +/obj/structure/prop{ + color = "#b30000"; + icon = 'icons/obj/pipes/power_cond_white.dmi'; + icon_state = "8-9"; + layer = 2.9; + name = "cable"; + pixel_x = 4; + pixel_y = -15 + }, +/obj/structure/prop{ + color = "#b30000"; + icon = 'icons/obj/pipes/power_cond_white.dmi'; + icon_state = "1-4"; + name = "cable"; + pixel_x = -9 + }, +/obj/structure/prop{ + color = "#b30000"; + icon = 'icons/obj/pipes/power_cond_white.dmi'; + icon_state = "8-10"; + name = "cable"; + pixel_x = 21 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin14" + }, +/area/golden_arrow/hangar) "cO" = ( /obj/structure/machinery/shower{ dir = 4 @@ -722,30 +865,21 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"cU" = ( +/obj/item/stack/cable_coil{ + pixel_x = 7; + pixel_y = 13 + }, +/obj/effect/decal/siding{ + icon_state = "siding8" + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) "cW" = ( /obj/structure/cargo_container/arious/right, /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"cX" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/phone_base{ - pixel_y = 30; - pixel_x = 9; - phone_id = "Overwatch"; - name = "overwatch receiver" - }, -/obj/structure/machinery/computer/ares_console{ - dir = 4; - pixel_y = 6; - pixel_x = 2 - }, -/obj/item/tool/pen{ - pixel_x = -5; - pixel_y = -11 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) "cY" = ( /obj/structure/largecrate/random/case/double, /obj/effect/decal/cleanable/dirt, @@ -777,6 +911,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) +"dc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail{ + dir = 4 + }, +/obj/item/facepaint/green{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/facepaint/black{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/facepaint/brown{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "de" = ( /turf/closed/shuttle/midway{ icon_state = "103"; @@ -790,24 +944,24 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"dg" = ( +"dh" = ( /obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver{ - pixel_y = 17; - pixel_x = -8 +/obj/item/prop/almayer/comp_open{ + pixel_x = -12; + pixel_y = 9 }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 12 +/obj/item/reagent_container/food/drinks/cans/souto/diet{ + pixel_x = 8; + pixel_y = 11 }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 4; - pixel_x = -6 +/obj/item/trash/chips{ + layer = 2.7; + pixel_y = -9 }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_x = 5 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar) "di" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -820,14 +974,6 @@ icon_state = "plating" }, /area/golden_arrow/engineering) -"dj" = ( -/obj/structure/machinery/chem_dispenser, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_container/glass/beaker/bluespace, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "dm" = ( /obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ @@ -848,17 +994,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"dr" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/effect/spawner/prop_gun/m41aMK1{ - pixel_y = -3; - pixel_x = 6 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "ds" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_y = 27 @@ -924,48 +1059,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"dH" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "blackcorner"; - dir = 1 - }, -/area/golden_arrow/hangar) -"dL" = ( -/obj/structure/closet/secure_closet{ - icon_broken = "fridgebroken"; - icon_closed = "fridge"; - icon_locked = "fridge1"; - icon_off = "fridge1"; - icon_opened = "fridgeopen"; - icon_state = "fridge1"; - name = "beverage fridge" - }, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - pixel_x = 8; - pixel_y = -7 - }, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - pixel_y = -1 - }, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - pixel_y = -4; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - pixel_y = -9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "dM" = ( /turf/closed/shuttle/midway{ icon_state = "72"; @@ -990,24 +1083,52 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) +"dR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/target{ + layer = 3.1; + name = "punching bag"; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "dS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"dW" = ( -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 10; - buckling_y = 10 +"dX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/almayer_B{ + layer = 2.01; + pixel_x = 14 + }, +/obj/item/ashtray/plastic{ + pixel_x = 10; + pixel_y = -3 }, -/obj/structure/machinery/light, /turf/open/floor/almayer, -/area/golden_arrow/engineering) -"dZ" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/area/golden_arrow/platoon_commander_rooms) +"dY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) +"dZ" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/open/floor/almayer, @@ -1023,49 +1144,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"ef" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{ - name = "\improper Tripoli" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/cigbutt{ - pixel_y = 13; - pixel_x = 1 - }, -/obj/item/trash/cigbutt{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/trash/cigbutt{ - pixel_y = 10; - pixel_x = 4; - layer = 3.2 - }, -/obj/item/trash/cigbutt{ - pixel_x = -10; - pixel_y = 13 - }, -/obj/item/trash/cigbutt{ - pixel_x = -1; - pixel_y = 17 - }, -/obj/item/trash/cigbutt{ - pixel_y = 10; - pixel_x = -7 - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"eg" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/plate{ - pixel_y = 13; - pixel_x = 4 - }, -/obj/item/trash/plate{ - pixel_x = -3 - }, -/turf/open/floor/almayer, -/area/golden_arrow/cryo_cells) "eh" = ( /turf/closed/shuttle/midway{ icon_state = "75"; @@ -1079,21 +1157,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"ek" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/item/storage/box/pillbottles{ - pixel_y = 9 - }, -/obj/item/storage/box/pillbottles{ - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "em" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2 @@ -1103,19 +1166,6 @@ icon_state = "plate" }, /area/golden_arrow/engineering) -"en" = ( -/obj/structure/sink{ - pixel_y = 24; - layer = 3.1 - }, -/obj/structure/mirror{ - pixel_y = 35; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/cryo_cells) "eo" = ( /turf/open/floor/almayer, /area/golden_arrow/dorms) @@ -1139,10 +1189,45 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/prep_hallway) -"ev" = ( +"es" = ( /turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 9 + dir = 5; + icon_state = "logo_directional1" + }, +/area/golden_arrow/hangar) +"et" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/door_control/brbutton{ + id = "weapons_conny"; + name = "weapons locker shutter control"; + pixel_x = -5; + pixel_y = 23; + req_one_access_txt = "19;12" + }, +/obj/structure/machinery/door_control/brbutton{ + id = "equipment_conny"; + name = "equipment locker shutter control"; + pixel_x = 7; + pixel_y = 23; + req_one_access_txt = "19;12" + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/platoonarmory) +"eu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, /area/golden_arrow/hangar) "ew" = ( @@ -1160,17 +1245,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"ez" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 2; - pixel_x = 5 - }, -/obj/structure/machinery/reagentgrinder/industrial{ - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "eD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, @@ -1211,18 +1285,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"eL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/obj/structure/pipes/vents/pump, -/obj/item/trash/uscm_mre{ - pixel_y = 14; - pixel_x = 9 - }, -/turf/open/floor/almayer, -/area/golden_arrow/dorms) "eN" = ( /obj/structure/machinery/gear{ id = "supply_elevator_gear" @@ -1247,48 +1309,14 @@ icon_state = "rasputin15" }, /area/golden_arrow/hangar) -"eR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/storage/belt/utility/full{ - pixel_y = 12 - }, -/obj/item/storage/belt/utility/full{ - pixel_y = 2; - pixel_x = 2 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/golden_arrow/engineering) "eS" = ( /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, /area/golden_arrow/hangar) -"eT" = ( -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "eW" = ( /turf/closed/wall/almayer, /area/golden_arrow/platoon_commander_rooms) -"eX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad One Equipment Locker"; - id = "equipment_conny" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "eY" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -1373,29 +1401,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) -"fn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver{ - pixel_y = 7; - pixel_x = -4; - layer = 3.03 - }, -/obj/item/tool/wirecutters{ - pixel_y = -7 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) -"fo" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ - req_one_access_txt = "8;12;39;40"; - req_access = list() - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "fp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1419,6 +1424,19 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/golden_arrow/hangar) +"fw" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -8; + pixel_y = 28 + }, +/obj/structure/machinery/computer/ares_console{ + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoon_commander_rooms) "fx" = ( /obj/structure/machinery/door/poddoor/railing, /obj/effect/decal/strata_decals/grime/grime1{ @@ -1428,6 +1446,28 @@ icon_state = "plate" }, /area/golden_arrow/engineering) +"fE" = ( +/obj/structure/largecrate/supply/medicine/medkits{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/structure/largecrate/supply/medicine/medkits{ + layer = 3.1; + pixel_x = 15; + pixel_y = 24 + }, +/obj/structure/largecrate/random/mini/med{ + pixel_x = -6; + pixel_y = 21 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "fF" = ( /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/floor/plating, @@ -1471,20 +1511,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoon_commander_rooms) -"fL" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = -20; - pixel_y = -7 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = 7; - pixel_x = -20 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/golden_arrow/prep_hallway) "fM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -1498,30 +1524,21 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"fO" = ( -/obj/structure/machinery/chem_master, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "fP" = ( /obj/structure/ship_ammo/rocket/napalm, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/golden_arrow/hangar) -"fR" = ( -/obj/item/prop/colony/canister{ - pixel_y = 19; - pixel_x = 3 +"fS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4 }, -/obj/effect/decal/strata_decals/grime/grime2, -/obj/item/tool/mop{ - pixel_x = -10; - pixel_y = 20 +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/medical) "fV" = ( /obj/structure/bed/chair{ dir = 8 @@ -1538,6 +1555,21 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"fY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/railing{ + dir = 2 + }, +/obj/item/tool/warning_cone{ + pixel_x = -15; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "fZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -1554,37 +1586,10 @@ /obj/structure/machinery/telecomms/relay/preset/tower, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"gc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/roller{ - pixel_y = 17 - }, -/obj/item/roller{ - pixel_y = 23 - }, -/obj/item/storage/firstaid/regular{ - pixel_y = 1; - pixel_x = -2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) -"gd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "apcbayrailing1" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 8 - }, -/area/golden_arrow/hangar) -"gg" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail{ - dir = 8 +"gg" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail{ + dir = 8 }, /obj/structure/machinery/computer/cameras/wooden_tv/prop{ dir = 4; @@ -1597,19 +1602,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"gh" = ( -/obj/structure/bed/bedroll{ - pixel_y = -8; - pixel_x = 3; - layer = 3.1 - }, -/obj/item/clothing/head/cmcap{ - layer = 4.2; - pixel_y = 6; - pixel_x = 4 - }, -/turf/closed/wall/almayer/outer, -/area/golden_arrow/hangar) "gi" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -1633,6 +1625,19 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) +"gl" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "black" + }, +/area/golden_arrow/hangar) "gm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -1700,9 +1705,20 @@ /turf/open/floor/plating, /area/golden_arrow/hangar) "gw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/strata_decals/grime/grime3, +/obj/structure/largecrate/supply/ammo{ + fill_from_loc = 1; + name = "materials crate" + }, +/obj/item/stack/sheet/metal/large_stack, +/obj/item/stack/sheet/plasteel{ + amount = 40; + pixel_x = 7; + pixel_y = 6 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1767,12 +1783,50 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) +"gJ" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "black" + }, +/area/golden_arrow/hangar) +"gK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/two{ + pixel_x = 14; + pixel_y = -26 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = -26 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) "gL" = ( /obj/structure/shuttle/part/dropship1/nose_front_left{ name = "\improper Tripoli" }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"gQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "weapons_conny"; + name = "\improper Squad One Weapons Locker"; + pixel_y = -4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) "gR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -1782,71 +1836,60 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/prep_hallway) -"gS" = ( +"gU" = ( /obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/tray{ - pixel_y = 3; - pixel_x = 6 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/obj/item/storage/box/cups{ - pixel_x = 2; - pixel_y = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 14; - pixel_y = 7 +/obj/item/trash/plate{ + pixel_x = -4; + pixel_y = 4 }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"gT" = ( +"gW" = ( /obj/structure/surface/table/almayer, -/obj/item/prop{ - icon = 'icons/obj/items/paper.dmi'; - icon_state = "newspaper"; - name = "The Marine Corps Gazette"; - desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines."; - pixel_y = 18; - pixel_x = 6 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) -"gV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stool{ - pixel_y = 20; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) -"gX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 }, -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" +/obj/item/storage/fancy/cigarettes/lucky_strikes{ + pixel_x = -7; + pixel_y = 9 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/item/prop/magazine/dirty{ + desc = "A copy of Playboy magazine. On the cover is photo of guitarist Sadie Summers, with the headline 'Sadie Summers tells ALL'. The article itself focuses on Sadie's many carnal exploits while on tour as well as her very public brawl at an LA nightclub that occured two years prior to the date of this issue. Flipping through the magazine you see article titles such as 'Jungle Mercenary: Life as an Ex-UPP commando', 'The whys and hows of choosing synthetic girls'."; + icon_state = "poster3"; + name = "Playboy Magazine: Issue March 2182"; + pixel_x = 3; + pixel_y = 7 }, -/area/golden_arrow/engineering) +/turf/open/floor/almayer, +/area/golden_arrow/cryo_cells) "gZ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"ha" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad Two Equipment Locker"; - id = "equipment_conny" +"hb" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/golden_arrow/platoonarmory) +/area/golden_arrow/hangar) +"hc" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "hd" = ( /obj/structure/shuttle/part/dropship1/lower_right_wall{ name = "\improper Tripoli" @@ -1878,17 +1921,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"hh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad Two Weapons Locker"; - id = "weapons_conny"; - pixel_y = -4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "hl" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/supply) @@ -1904,26 +1936,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"hp" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/technology_scanner{ - pixel_x = 15 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/item/reagent_container/food/drinks/dry_ramen{ - pixel_y = 5; - pixel_x = 2 - }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 1; - pixel_x = -10 - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "hq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -1953,6 +1965,17 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"hv" = ( +/obj/item/paper{ + icon_state = "paper_words"; + info = "OUT OF ORDER - When I find the dumbass that thought it was a good idea to drive over the elevator with the APC they're gonna get their ass beat."; + layer = 3.01; + name = "OUT OF ORDER"; + pixel_x = 5; + pixel_y = -3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/hangar) "hx" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -1965,18 +1988,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"hB" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/straight_razor{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/clothing/head/cmcap/bridge{ - pixel_y = 6; - pixel_x = 5 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) "hC" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -1997,21 +2008,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"hF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/largecrate/random/case/double{ - pixel_y = 9; - layer = 3.1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "hG" = ( /obj/structure/sign/banners/united_americas_flag{ pixel_y = 30 @@ -2021,14 +2017,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonprep) -"hI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "hJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -2041,15 +2029,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"hK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "hL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -2070,6 +2049,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/shuttle/elevator/grating, /area/golden_arrow/supply) +"hO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "bay1door"; + name = "\improper Weapons Bay One Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "hP" = ( /obj/structure/machinery/body_scanconsole{ pixel_y = 6 @@ -2090,16 +2082,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"hT" = ( -/obj/structure/barricade/handrail, -/obj/structure/reagent_dispensers/fueltank{ - layer = 2.9; - icon = 'icons/obj/structures/props/generic_props.dmi'; - icon_state = "weldtank_old"; - anchored = 1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "hU" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -2130,19 +2112,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"hZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/largecrate/supply/supplies/flares{ - pixel_y = 9; - pixel_x = -3 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/hangar) "ie" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -2202,6 +2171,55 @@ icon_state = "test_floor4" }, /area/golden_arrow/platoonprep) +"im" = ( +/obj/item/reagent_container/food/drinks/cans/beer{ + layer = 4.2; + pixel_x = -11; + pixel_y = 8 + }, +/turf/closed/wall/almayer/outer, +/area/golden_arrow/hangar) +"in" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver{ + pixel_x = -8; + pixel_y = 17 + }, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_y = 12 + }, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = 5 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) +"io" = ( +/turf/open/floor/almayer/uscm{ + dir = 8; + icon_state = "logo_directional1" + }, +/area/golden_arrow/hangar) +"ip" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/tableflag{ + pixel_x = -9; + pixel_y = 2 + }, +/obj/item/folder/black{ + icon_state = "folder_black_white"; + pixel_x = 2; + pixel_y = 14 + }, +/obj/item/reagent_container/food/drinks/cans/souto/lime{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/golden_arrow/shared_office) "iq" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Prep Lockers" @@ -2222,14 +2240,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"iu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/ares_console{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/golden_arrow/dorms) "iw" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -2268,30 +2278,41 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"iJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/golden_arrow/platoonprep) -"iP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"iF" = ( +/obj/structure/largecrate/supply/motiondetectors, +/obj/structure/largecrate/supply/explosives/grenades/less{ + icon_state = "case"; + pixel_y = 10 }, -/obj/structure/largecrate/random/case/small{ - pixel_y = 35; +/obj/item/ammo_box/magazine/mk1{ layer = 3.1; - pixel_x = 3 + pixel_x = -2; + pixel_y = 14 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) +"iI" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/plate{ + pixel_x = 7; + pixel_y = 8 }, -/obj/effect/decal/cleanable/blood/oil, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -4; + pixel_y = 13 + }, +/obj/item/reagent_container/food/snacks/protein_pack{ + pixel_x = 3; + pixel_y = 9 + }, +/turf/open/floor/almayer, +/area/golden_arrow/cryo_cells) +"iJ" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo_arrow" }, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonprep) "iQ" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ @@ -2307,16 +2328,21 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/engineering) -"iU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "apcbayrailing1" +"iS" = ( +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "black"; - dir = 4 + dir = 4; + icon_state = "blackcorner" }, /area/golden_arrow/hangar) "iW" = ( @@ -2324,34 +2350,6 @@ /obj/structure/curtain/red, /turf/open/floor/plating, /area/golden_arrow/platoon_commander_rooms) -"iX" = ( -/turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 8 - }, -/area/golden_arrow/hangar) -"iY" = ( -/obj/structure/largecrate/supply/medicine/medkits{ - pixel_y = 9; - pixel_x = -4 - }, -/obj/structure/largecrate/supply/medicine/medkits{ - pixel_y = 24; - pixel_x = 15; - layer = 3.1 - }, -/obj/structure/largecrate/random/mini/med{ - pixel_y = 21; - pixel_x = -6 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "iZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2360,6 +2358,15 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) +"ja" = ( +/obj/structure/largecrate/supply/motiondetectors, +/obj/item/ammo_box/magazine/mk1{ + layer = 3.1; + pixel_x = -12; + pixel_y = 14 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) "jd" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -2373,24 +2380,29 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"je" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3; - pixel_x = -1 +"jf" = ( +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/bedroll{ - pixel_x = 1; - color = "#333333"; - name = "gym mat"; - buckle_lying = null; - can_buckle = 0; - foldabletype = null; - desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise." +/obj/structure/largecrate/random/case/small{ + anchored = 1; + density = 0; + pixel_y = 14 + }, +/obj/structure/prop{ + desc = "A wooden rack fitted to the wall."; + icon = 'icons/obj/items/items.dmi'; + icon_state = "sheet-wood"; + layer = 2.1; + name = "wooden rack"; + pixel_y = 35 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonprep) "jg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -2403,6 +2415,17 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"jh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "weapons_conny"; + name = "\improper Squad Two Weapons Locker"; + pixel_y = -4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) "ji" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -2472,26 +2495,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"jr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/strata_decals/grime/grime3, -/obj/structure/largecrate/supply/ammo{ - name = "materials crate"; - fill_from_loc = 1 - }, -/obj/item/stack/sheet/metal/large_stack, -/obj/item/stack/sheet/plasteel{ - amount = 40; - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "jt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -2506,25 +2509,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"ju" = ( -/obj/item/trash/cigbutt{ - pixel_y = 10; - pixel_x = 4; - layer = 3.2; - randpixel = 0 - }, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = -2; - pixel_y = 1; - layer = 3.2 - }, -/obj/structure/largecrate/supply/weapons/pistols{ - layer = 3.1; - pixel_y = -7 - }, -/turf/closed/wall/almayer/outer, -/area/golden_arrow/hangar) "jw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -2539,44 +2523,36 @@ name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"jy" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - name = "Midway Remote Control Console"; - shuttleId = "dropship_midway"; - pixel_y = 6; - layer = 3.1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) -"jA" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad Two Weapons Locker"; - id = "weapons_conny"; - pixel_y = -4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) -"jB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +"jz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/door/airlock/almayer/secure{ - dir = 8; - name = "\improper Shared Office"; - req_one_access_txt = "12;32"; - req_access = list() - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/largecrate/supply/ammo{ + fill_from_loc = 1; + name = "smoke grenades case"; + pixel_y = 11 }, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/golden_arrow/shared_office) +/area/golden_arrow/hangar) "jC" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -2601,17 +2577,6 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) -"jG" = ( -/obj/item/paper{ - icon_state = "paper_words"; - pixel_y = -3; - pixel_x = 5; - layer = 3.01; - info = "OUT OF ORDER - When I find the dumbass that thought it was a good idea to drive over the elevator with the APC they're gonna get their ass beat."; - name = "OUT OF ORDER" - }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/hangar) "jH" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_y = 27 @@ -2653,6 +2618,15 @@ /obj/structure/bed/chair, /turf/open/floor/almayer, /area/golden_arrow/briefing) +"jL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "jM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -2670,19 +2644,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"jO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Weapons Bay One Blast Door"; - id = "bay1door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/hangar) "jP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ @@ -2691,6 +2652,19 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"jQ" = ( +/obj/structure/ship_ammo/minirocket, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ship_ammo/minirocket{ + layer = 3.1; + pixel_y = 9 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "jS" = ( /obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing{ name = "\improper Tripoli" @@ -2718,15 +2692,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"jV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/dartboard{ - pixel_y = 41; - layer = 3.2 - }, -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "jW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -2766,18 +2731,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"kg" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/item/bedsheet/rd, -/obj/effect/decal/cleanable/dirt, -/obj/item/prop/magazine/book/theartofwar{ - pixel_x = -1; - layer = 4.1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) "kh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/pump{ @@ -2799,26 +2752,24 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) +"kj" = ( +/obj/structure/prop{ + color = "#b30000"; + icon = 'icons/obj/pipes/power_cond_white.dmi'; + icon_state = "4-5"; + name = "cable"; + pixel_x = 5 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin14" + }, +/area/golden_arrow/hangar) "kl" = ( /obj/structure/shuttle/part/dropship1/nose_front_right{ name = "\improper Tripoli" }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"km" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/ammunition{ - pixel_x = -18 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad One Weapons Locker"; - id = "weapons_conny"; - pixel_y = -4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "kn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -2864,15 +2815,37 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"kD" = ( -/obj/structure/closet/secure_closet/marine_personal{ - pixel_x = -7; - job = "Smartgunner" +"kz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/prop{ + density = 1; + desc = "A pump used for refueling the dropship."; + icon_state = "pipe_d"; + layer = 2.7; + name = "refueling pump"; + pixel_x = -4; + pixel_y = -5 }, -/obj/structure/closet/secure_closet/marine_personal{ - pixel_x = 8; - job = "Squad Sergeant" +/obj/effect/decal/siding{ + icon_state = "siding2" + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) +"kB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 8 }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -2883,19 +2856,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"kH" = ( -/obj/structure/ship_ammo/minirocket, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/ship_ammo/minirocket{ - pixel_y = 9; - layer = 3.1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "kI" = ( /obj/structure/bed/chair{ dir = 1 @@ -2933,6 +2893,18 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"kS" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Prep Lockers" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonprep) "kT" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -2962,6 +2934,16 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"kX" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "bay1door"; + name = "\improper Weapons Bay One Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "kY" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -2983,19 +2965,6 @@ /obj/item/clothing/under/shorts/grey, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"lc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/catwalk{ - pixel_x = 2; - pixel_y = -9 - }, -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "ld" = ( /turf/closed/shuttle/midway{ icon_state = "83"; @@ -3039,16 +3008,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"li" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - pixel_y = 6; - density = 0; - pixel_x = -10 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/cryo_cells) "lj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, @@ -3063,18 +3022,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"lm" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 - }, -/area/golden_arrow/hangar) "lo" = ( /turf/closed/shuttle/midway{ icon_state = "47"; @@ -3134,33 +3081,6 @@ icon_state = "rasputin3" }, /area/golden_arrow/hangar) -"lA" = ( -/obj/structure/machinery/autodoc_console{ - dir = 1; - pixel_y = 6 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 1; - pixel_x = -1 - }, -/obj/structure/sign/safety/autodoc{ - pixel_x = -17 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "lB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -3177,6 +3097,18 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"lF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "black" + }, +/area/golden_arrow/hangar) "lH" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -3189,15 +3121,17 @@ icon_state = "black" }, /area/golden_arrow/hangar) -"lK" = ( -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing2" +"lJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/squad_sergeant{ + name = "squad two sergeant locker"; + req_access_txt = "32;40"; + req_one_access = list() }, /turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 + icon_state = "plate" }, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonprep) "lL" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_y = 27 @@ -3211,6 +3145,13 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"lM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delayone, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "lO" = ( /obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons{ name = "\improper Tripoli" @@ -3240,31 +3181,26 @@ icon_state = "plate" }, /area/golden_arrow/engineering) -"lV" = ( -/obj/structure/machinery/power/smes/buildable, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"lU" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + req_one_access = null }, -/area/golden_arrow/engineering) -"lW" = ( -/obj/structure/closet/crate/trashcart{ - pixel_y = 11 +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/sign/safety/coffee{ - pixel_y = 29; - pixel_x = 13 +/obj/structure/sign/safety/rewire{ + pixel_x = 12; + pixel_y = 32 }, -/obj/item/trash/candy, -/obj/item/trash/burger, -/obj/item/trash/cigbutt, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/engineering) +"lV" = ( +/obj/structure/machinery/power/smes/buildable, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/golden_arrow/cryo_cells) +/area/golden_arrow/engineering) "lY" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/prop/tableflag/uscm{ @@ -3277,6 +3213,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) +"lZ" = ( +/obj/structure/machinery/floodlight/landing/floor, +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "mc" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -3286,25 +3231,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/engineering) -"me" = ( -/obj/structure/machinery/door/airlock/almayer/secure{ - dir = 1; - name = "\improper Assembly Room"; - req_one_access_txt = "19;12"; - req_access = list() - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/briefing) "mf" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -3325,6 +3251,29 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"mk" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger{ + pixel_y = -14 + }, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/trash/cigbutt{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/trash/cigbutt{ + pixel_x = -4; + pixel_y = 15 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) "ml" = ( /obj/structure/shuttle/part/dropship1/transparent/upper_left_wing{ name = "\improper Tripoli" @@ -3332,16 +3281,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/golden_arrow/hangar) -"mo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 - }, -/area/golden_arrow/hangar) "mp" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -3354,15 +3293,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"mq" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{ - name = "\improper Tripoli cargo door"; - locked = 1 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/golden_arrow/hangar) "mr" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -3370,6 +3300,19 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"mt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "bay2door"; + name = "\improper Weapons Bay Two Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "mu" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -3412,6 +3355,42 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"mD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/tool/wet_sign{ + pixel_x = -14; + pixel_y = 14 + }, +/obj/item/tool/wet_sign{ + pixel_x = -17; + pixel_y = 10 + }, +/obj/item/tool/wet_sign{ + pixel_x = -13; + pixel_y = 6 + }, +/obj/item/tool/wet_sign{ + pixel_x = -15; + pixel_y = 2 + }, +/obj/item/tool/wet_sign{ + pixel_x = -13; + pixel_y = -2 + }, +/obj/item/tool/wet_sign{ + pixel_x = 1; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/engineering) "mE" = ( /obj/structure/platform{ dir = 1 @@ -3424,24 +3403,6 @@ icon_state = "rasputin3" }, /area/golden_arrow/hangar) -"mG" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/almayer/comp_open{ - pixel_y = 9; - pixel_x = -12 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet{ - pixel_x = 8; - pixel_y = 11 - }, -/obj/item/trash/chips{ - layer = 2.7; - pixel_y = -9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "mH" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -3533,22 +3494,6 @@ icon_state = "rasputin3" }, /area/golden_arrow/hangar) -"mW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver{ - pixel_x = 1; - icon_state = "screwdriver4" - }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_y = 15; - pixel_x = -14 - }, -/obj/structure/machinery/camera/autoname/golden_arrow{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "mX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -3587,25 +3532,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"nf" = ( -/obj/structure/cargo_container/kelland/right{ - opacity = 0 - }, -/obj/structure/cargo_container/kelland/right{ - pixel_y = 22; - opacity = 0 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "ng" = ( /obj/structure/machinery/floodlight/landing/floor{ pixel_x = -2 @@ -3614,6 +3540,23 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"nh" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/almayer/comp_closed{ + pixel_x = -14; + pixel_y = 13 + }, +/obj/item/reagent_container/food/drinks/coffee/marine, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = -13; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = 9; + pixel_y = 9 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "ni" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer, @@ -3628,14 +3571,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) -"nk" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "nl" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -3664,14 +3599,6 @@ icon_state = "plate" }, /area/golden_arrow/platoonprep) -"np" = ( -/obj/structure/machinery/door/airlock/maintenance/colony{ - dir = 1; - req_one_access = null; - name = "\improper Supply Launch Bay" - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "nq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/case/double, @@ -3691,19 +3618,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"nu" = ( -/obj/structure/closet/secure_closet/marine_personal{ - pixel_x = 8; - job = "Smartgunner" - }, -/obj/structure/closet/secure_closet/marine_personal{ - pixel_x = -7; - job = "Squad Sergeant" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "nv" = ( /obj/structure/surface/table/almayer, /obj/item/hardpoint/support/flare_launcher{ @@ -3713,22 +3627,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"nw" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = 1; - pixel_y = 12 - }, -/obj/item/prop{ - icon = 'icons/obj/items/paper.dmi'; - icon_state = "newspaper"; - name = "The Marine Corps Gazette"; - desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines."; - pixel_y = -2; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/cryo_cells) "nx" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 @@ -3745,6 +3643,16 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"nD" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -10; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/cryo_cells) "nE" = ( /obj/structure/ship_ammo/rocket/widowmaker, /turf/open/floor/almayer{ @@ -3767,24 +3675,11 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/engineering) -"nJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad One Weapons Locker"; - id = "weapons_conny"; - pixel_y = -4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) -"nL" = ( +"nK" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/almayer/uscm{ + dir = 1; + icon_state = "logo_directional1" }, /area/golden_arrow/hangar) "nM" = ( @@ -3830,15 +3725,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/shared_office) -"nU" = ( +"nT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 }, /obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - name = "Maintenance Bay Blast Door"; closed_layer = 3.3; + dir = 4; layer = 3.3; + name = "Maintenance Bay Blast Door"; open_layer = 3.3 }, /turf/open/floor/almayer, @@ -3872,15 +3767,6 @@ icon_state = "rasputin14" }, /area/golden_arrow/hangar) -"oa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "od" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -3892,6 +3778,18 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) +"oe" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Dorms" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/dorms) "og" = ( /turf/closed/wall/almayer, /area/golden_arrow/cryo_cells) @@ -3936,22 +3834,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"on" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/largecrate/supply/supplies/sandbags{ - pixel_y = 7; - layer = 4.2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "oo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/atm{ @@ -3965,19 +3847,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"ov" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Weapons Bay Two Blast Door"; - id = "bay2door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/hangar) "oy" = ( /obj/structure/machinery/light{ dir = 8 @@ -3985,17 +3854,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"oz" = ( -/obj/structure/machinery/floodlight/landing/floor{ - pixel_x = 3 - }, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "oB" = ( /obj/structure/machinery/door/poddoor/almayer, /turf/open/floor/almayer, @@ -4020,6 +3878,18 @@ icon_state = "rasputin3" }, /area/golden_arrow/hangar) +"oH" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/megaphone{ + pixel_x = 11; + pixel_y = 7 + }, +/obj/item/prop/tableflag/uscm{ + pixel_x = -12; + pixel_y = -1 + }, +/turf/open/floor/almayer, +/area/golden_arrow/briefing) "oI" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -4029,6 +3899,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoonarmory) +"oJ" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/largecrate/random/case/small{ + layer = 3.1; + pixel_x = 18; + pixel_y = 18 + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) +"oK" = ( +/obj/item/storage/box/guncase/pumpshotgun/special{ + pixel_y = 4 + }, +/obj/item/storage/box/guncase/flamer/special{ + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/surface/rack, +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) "oM" = ( /obj/structure/filingcabinet{ density = 0; @@ -4075,16 +3965,15 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"oV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +"oW" = ( +/obj/structure/surface/table/almayer, +/obj/structure/largecrate/random/case{ + pixel_y = 11 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 1; - pixel_x = -1 +/obj/item/reagent_container/food/drinks/coffee/marine{ + layer = 3.11; + pixel_x = 4; + pixel_y = 15 }, /turf/open/floor/almayer, /area/golden_arrow/hangar) @@ -4101,6 +3990,17 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"oY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door_control{ + id = "synthbay"; + name = "storage bay door-control"; + pixel_y = -19 + }, +/turf/open/floor/almayer, +/area/golden_arrow/synthcloset) "pa" = ( /obj/structure/ship_ammo/rocket/widowmaker, /obj/effect/decal/cleanable/dirt, @@ -4116,23 +4016,51 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"pe" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" +"pc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 + dir = 9 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) +"pd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "weapons_conny"; + name = "\improper Squad Two Weapons Locker"; + pixel_y = -4 }, /turf/open/floor/almayer{ - icon_state = "blackcorner"; - dir = 4 + icon_state = "test_floor4" }, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonarmory) +"pf" = ( +/obj/structure/machinery/door_control{ + id = "cargolock"; + name = "GM cargo lock control"; + pixel_x = -7; + pixel_y = 11 + }, +/obj/structure/machinery/door_control{ + id = "bay1door"; + name = "GM north weapon bay control"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/machinery/door_control{ + id = "bay2door"; + name = "GM south weapon bay control"; + pixel_x = 8; + pixel_y = 1 + }, +/turf/open/floor/plating, +/area/golden_arrow/supply) "pg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable{ @@ -4140,25 +4068,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"pi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2; - pixel_x = -1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname/golden_arrow{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "pl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4170,36 +4079,41 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"pq" = ( +/obj/structure/machinery/door/airlock/maintenance/colony{ + dir = 1; + name = "\improper Supply Launch Bay"; + req_one_access = null + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "pr" = ( /turf/open/floor/almayer, /area/golden_arrow/engineering) -"pw" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/largecrate/random/case/small{ - pixel_y = 18; - pixel_x = 18; - layer = 3.1 +"pt" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 8; + id = "apcbayrailing1" }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"px" = ( -/obj/structure/cable{ - layer = 2.45; - pixel_x = 7; - pixel_y = 1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "black" }, +/area/golden_arrow/hangar) +"pu" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, /obj/structure/prop{ - icon = 'icons/obj/pipes/power_cond_white.dmi'; - icon_state = "0-8"; - color = "#b30000"; - pixel_y = 2; - pixel_x = 2; - name = "cable" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin14" + density = 1; + desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone. This thing probably never even worked."; + icon = 'icons/obj/structures/props/almayer_props.dmi'; + icon_state = "lz_detector"; + layer = 3.1; + name = "\improper Damaged AN/AVD-60 LZ detector" }, -/area/golden_arrow/hangar) +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "py" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -4230,20 +4144,19 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"pD" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - req_one_access = null +"pE" = ( +/obj/structure/closet/secure_closet/marine_personal{ + job = "Smartgunner"; + pixel_x = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +/obj/structure/closet/secure_closet/marine_personal{ + job = "Squad Sergeant"; + pixel_x = -7 }, -/obj/structure/sign/safety/rewire{ - pixel_y = 32; - pixel_x = 12 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/engineering) +/area/golden_arrow/cryo_cells) "pF" = ( /obj/structure/sign/safety/galley{ pixel_y = 28 @@ -4264,6 +4177,34 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) +"pK" = ( +/obj/item/prop/colony/canister{ + pixel_x = 3; + pixel_y = 19 + }, +/obj/effect/decal/strata_decals/grime/grime2, +/obj/item/tool/mop{ + pixel_x = -10; + pixel_y = 20 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) +"pL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 1; + pixel_y = -26 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/prep_hallway) "pN" = ( /obj/structure/prop/dam/crane{ bound_height = 32; @@ -4273,17 +4214,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"pO" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "apcbayrailing1" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 8 - }, -/area/golden_arrow/hangar) "pR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -4291,19 +4221,24 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) -"pU" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"pT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/railing{ + dir = 8; + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "black" + }, +/area/golden_arrow/hangar) +"pU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoon_commander_rooms) -"pV" = ( -/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "pW" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -4314,13 +4249,30 @@ name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"pZ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 8 +"qc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing2" }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "black" + }, +/area/golden_arrow/hangar) +"qh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/largecrate/random/case/double{ + layer = 3.1; + pixel_y = 9 }, +/turf/open/floor/almayer, /area/golden_arrow/hangar) "qi" = ( /obj/structure/machinery/cm_vending/gear/synth, @@ -4380,18 +4332,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"qu" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light, -/obj/item/tool/soap/deluxe, -/obj/item/tool/soap{ - pixel_y = 15; - pixel_x = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "qv" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -4418,17 +4358,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonprep) -"qz" = ( -/obj/structure/ship_ammo/minirocket, -/obj/structure/ship_ammo/minirocket{ - pixel_y = 9; - layer = 3.1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "qD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable/heavyduty{ @@ -4437,39 +4366,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoonprep) -"qG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" +"qE" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "equipment_conny"; + name = "\improper Squad One Equipment Locker" }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonarmory) "qH" = ( /obj/structure/shuttle/part/dropship1/lower_left_wall{ name = "\improper Tripoli" }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"qI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2; - pixel_x = -1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "qJ" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -4483,45 +4394,15 @@ /obj/effect/decal/strata_decals/grime/grime3, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"qN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/two{ - pixel_x = 14; - pixel_y = -26 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -26 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) -"qP" = ( +"qM" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/ammo_box/magazine/mk1{ - layer = 3.1; - pixel_y = 13; - pixel_x = 3 - }, -/obj/item/facepaint/sunscreen_stick{ - pixel_y = 2; - pixel_x = -2; - layer = 3.2 - }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = 24; - serial_number = 11 +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/platoonprep) +/area/golden_arrow/hangar) "qQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -4529,37 +4410,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"qT" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/tray{ - pixel_y = 6; - pixel_x = -5 - }, -/obj/item/trash/plate{ - pixel_y = 5; - pixel_x = -5 - }, -/obj/item/trash/plate{ - pixel_y = 7; - pixel_x = -3 - }, -/obj/item/trash/plate{ - pixel_y = 9; - pixel_x = -4 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/cryo_cells) -"qU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "qW" = ( /obj/structure/closet/secure_closet/platoon_sergeant, /obj/effect/decal/cleanable/dirt, @@ -4567,14 +4417,6 @@ icon_state = "plate" }, /area/golden_arrow/platoonprep) -"qZ" = ( -/obj/item/reagent_container/food/drinks/cans/beer{ - layer = 4.2; - pixel_y = 8; - pixel_x = -11 - }, -/turf/closed/wall/almayer/outer, -/area/golden_arrow/hangar) "ra" = ( /obj/item/tool/mop{ pixel_x = -1; @@ -4582,6 +4424,23 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"rb" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_y = 9 + }, +/obj/item/reagent_container/food/snacks/cracker{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/item/reagent_container/food/snacks/cracker{ + pixel_y = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "rd" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -4646,17 +4505,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"ru" = ( -/obj/structure/machinery/floodlight/landing/floor{ - pixel_x = -2 - }, -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "rv" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -4668,13 +4516,16 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"rz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 4 +"ry" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing2" }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "black" }, /area/golden_arrow/hangar) "rA" = ( @@ -4705,16 +4556,6 @@ icon_state = "plating" }, /area/golden_arrow/engineering) -"rG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad Two Equipment Locker"; - id = "equipment_conny" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "rH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -4784,27 +4625,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) -"rX" = ( -/obj/structure/cargo_container/wy/right{ - pixel_y = -17; - opacity = 0 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/item/device/flashlight/lamp/on{ - layer = 4.2; - pixel_y = 19; - pixel_x = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "rY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable/heavyduty{ @@ -4820,6 +4640,22 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"sa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/largecrate/supply/supplies/sandbags{ + layer = 4.2; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "sb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4851,6 +4687,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"sh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "sk" = ( /obj/effect/landmark/start/marine/leader/alpha, /obj/effect/landmark/late_join/alpha, @@ -4860,26 +4705,52 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) -"so" = ( -/obj/structure/surface/rack{ - pixel_y = 19 +"sl" = ( +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" }, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/medical/ointment{ - pixel_y = 34; - pixel_x = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 1; + icon_state = "blackcorner" }, -/area/golden_arrow/cryo_cells) -"sq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/area/golden_arrow/hangar) +"sn" = ( +/obj/structure/machinery/floodlight/landing/floor{ + pixel_x = -2 }, -/obj/item/tool/wirecutters{ - pixel_x = -8; - pixel_y = 18 +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) +"sp" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/largecrate/random/case/double, +/obj/item/toy/beach_ball/holoball{ + pixel_x = -2; + pixel_y = 15 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/golden_arrow/hangar) +"sq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/tool/wirecutters{ + pixel_x = -8; + pixel_y = 18 }, /turf/open/floor/almayer, /area/golden_arrow/hangar) @@ -4893,22 +4764,26 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) -"st" = ( -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Vehicle Bay One Blast Door"; - id = "apc1blastdoor" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/hangar) "su" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) +"sv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) "sy" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -4932,10 +4807,31 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) +"sA" = ( +/obj/structure/closet/secure_closet/smartgunner{ + name = "squad one smartgunner locker"; + req_access_txt = "14;39"; + req_one_access = list() + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/platoonprep) "sF" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating, /area/golden_arrow/hangar) +"sG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "black" + }, +/area/golden_arrow/hangar) "sH" = ( /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -4954,21 +4850,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/platoonarmory) -"sJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) -"sL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/almayer{ - name = "\improper Synthetic Storage Bay"; - id = "synthbay" - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "sM" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -4984,21 +4865,60 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"sO" = ( +/obj/structure/prop{ + can_buckle = 1; + desc = "A regular case you'd sit on. The label says it's full of steel sheets. Probably empty now."; + icon = 'icons/obj/structures/crates.dmi'; + icon_state = "case"; + layer = 3.6; + name = "\improper uncomfy case" + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) +"sQ" = ( +/obj/structure/fence, +/obj/structure/machinery/door/poddoor/almayer/open{ + closed_layer = 3.3; + dir = 4; + id = "squadblastdoor"; + layer = 3.3; + name = "First Platoon Ready Bay Blast Door"; + open_layer = 3.3 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) "sR" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "cargo_arrow" }, /area/golden_arrow/engineering) -"sU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 8 +"sT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/hangar) +/area/golden_arrow/briefing) "sW" = ( /obj/structure/closet/wardrobe{ name = "PT uniform" @@ -5055,14 +4975,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"tc" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "td" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -5074,6 +4986,14 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"tg" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/almayer/comp_open{ + pixel_x = -6; + pixel_y = 9 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "th" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -5097,6 +5017,40 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"tp" = ( +/obj/structure/machinery/door/airlock/almayer/secure{ + dir = 1; + name = "\improper Assembly Room"; + req_access = list(); + req_one_access_txt = "19;12" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/briefing) +"tr" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 4; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/storage{ + pixel_x = -18; + pixel_y = -7 + }, +/obj/structure/sign/safety/two{ + pixel_x = -18; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "ts" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -5115,6 +5069,33 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"tu" = ( +/obj/structure/machinery/autodoc_console{ + dir = 1; + pixel_y = 6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/sign/safety/autodoc{ + pixel_x = -17 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "tv" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/closet/coffin/woodencrate{ @@ -5132,18 +5113,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) -"ty" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2; - pixel_x = -1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "tA" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -5169,26 +5138,17 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"tD" = ( +"tC" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - pixel_y = 19; - density = 0 - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) -"tG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 +/obj/structure/largecrate/supply/supplies/flares{ + pixel_x = -3; + pixel_y = 9 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, /area/golden_arrow/hangar) "tJ" = ( @@ -5236,12 +5196,14 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"tM" = ( -/turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 5 +"tO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + density = 0; + pixel_y = 19 }, -/area/golden_arrow/hangar) +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "tP" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/co2_knife{ @@ -5301,24 +5263,6 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"tW" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/item/storage/fancy/cigarettes/lucky_strikes{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/prop/magazine/dirty{ - icon_state = "poster3"; - pixel_y = 7; - pixel_x = 3; - name = "Playboy Magazine: Issue March 2182"; - desc = "A copy of Playboy magazine. On the cover is photo of guitarist Sadie Summers, with the headline 'Sadie Summers tells ALL'. The article itself focuses on Sadie's many carnal exploits while on tour as well as her very public brawl at an LA nightclub that occured two years prior to the date of this issue. Flipping through the magazine you see article titles such as 'Jungle Mercenary: Life as an Ex-UPP commando', 'The whys and hows of choosing synthetic girls'." - }, -/turf/open/floor/almayer, -/area/golden_arrow/cryo_cells) "tX" = ( /obj/structure/machinery/power/smes/buildable, /obj/effect/decal/cleanable/dirt, @@ -5326,28 +5270,35 @@ icon_state = "test_floor4" }, /area/golden_arrow/engineering) -"uc" = ( -/obj/effect/decal/strata_decals/grime/grime1, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +"ua" = ( +/obj/structure/sign/safety/ladder{ + pixel_y = 29 }, -/obj/structure/machinery/disposal{ - density = 0; - layer = 3.2; - pixel_y = 12 +/obj/effect/decal/cleanable/cobweb, +/obj/structure/ladder{ + height = -1; + id = "enginorth" }, -/obj/structure/sign/poster{ - pixel_y = 6; - pixel_x = -27; - icon_state = "poster15"; - name = "pulse rifle pinup"; - desc = "The Armat Battlefield Systems Model 41 Derivative 'A' Pulse Rifle Mark One. The only pinup you'll ever need." +/turf/open/floor/almayer, +/area/golden_arrow/engineering) +"ub" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3; + pixel_x = -1 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/bedroll{ + buckle_lying = null; + can_buckle = 0; + color = "#333333"; + desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise."; + foldabletype = null; + name = "gym mat"; + pixel_x = 1 }, /turf/open/floor/almayer, -/area/golden_arrow/platoonprep) +/area/golden_arrow/hangar) "ud" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -5355,25 +5306,16 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) -"ug" = ( -/obj/structure/machinery/door/airlock/maintenance/colony{ - dir = 1; - req_one_access = null; - name = "\improper Power Substation" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"uf" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 8; + id = "apcbayrailing2" }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "black" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar) "uh" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/prep_hallway) @@ -5389,6 +5331,14 @@ icon_state = "plate" }, /area/golden_arrow/engineering) +"uj" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/colony/game{ + pixel_x = 15; + pixel_y = 10 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) "uk" = ( /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) @@ -5457,18 +5407,26 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"ux" = ( -/obj/structure/prop{ - name = "\improper seat-like case"; - desc = "It's a case made into an impromptu seat."; - icon_state = "case"; - icon = 'icons/obj/structures/crates.dmi'; - can_buckle = 1; - pixel_y = -2; - layer = 3.6 +"uw" = ( +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing2" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "black" }, -/turf/open/floor/almayer, /area/golden_arrow/hangar) +"uy" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/structure/machinery/reagentgrinder/industrial{ + pixel_y = 8 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "uz" = ( /turf/closed/shuttle/midway{ icon_state = "69"; @@ -5489,18 +5447,6 @@ icon_state = "plate" }, /area/golden_arrow/briefing) -"uB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "uC" = ( /obj/item/storage/toolbox/mechanical{ pixel_x = 3; @@ -5530,19 +5476,17 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"uH" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +"uF" = ( +/obj/structure/sink{ + layer = 3.1; + pixel_y = 24 }, -/turf/open/floor/almayer{ - icon_state = "blackcorner"; - dir = 8 +/obj/structure/mirror{ + pixel_x = -1; + pixel_y = 35 }, -/area/golden_arrow/hangar) +/turf/open/floor/almayer, +/area/golden_arrow/platoon_commander_rooms) "uI" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -5551,14 +5495,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"uJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_container/glass/bucket/janibucket{ - pixel_y = 15; - pixel_x = -7 - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "uK" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -5584,33 +5520,20 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"uP" = ( -/obj/structure/machinery/power/terminal, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/cable_coil, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/tool/warning_cone{ - pixel_y = 16; - pixel_x = -15 - }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/engineering) -"uQ" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/largecrate/random/case/double, -/obj/item/toy/beach_ball/holoball{ - pixel_y = 15; - pixel_x = -2 +"uR" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = -20; + pixel_y = -7 }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -20; + pixel_y = 7 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "cargo_arrow" }, -/area/golden_arrow/hangar) +/area/golden_arrow/prep_hallway) "uS" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -5623,21 +5546,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"uU" = ( -/obj/item/storage/toolbox/mechanical/green{ - pixel_y = -14; - pixel_x = 2 - }, -/obj/structure/prop{ - icon = 'icons/obj/structures/props/almayer_props64.dmi'; - icon_state = "fuel_enhancer"; - name = "Damaged FS/FES-3 fuel enhancer"; - desc = "A fuel enhancement system for dropships. It improves the thrust produced by the fuel combustion for faster travels. Full of bullet holes and probably needs to be replaced. The label says it was manufactured in 2171"; - density = 1; - pixel_y = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/hangar) "uW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -5651,6 +5559,21 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) +"uX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/storage/belt/utility/full{ + pixel_y = 12 + }, +/obj/item/storage/belt/utility/full{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/engineering) "uY" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Cryo Bay" @@ -5667,6 +5590,23 @@ icon_state = "test_floor4" }, /area/golden_arrow/cryo_cells) +"uZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/machinery/prop/almayer/CICmap{ + density = 0; + icon_state = "shuttle"; + layer = 2.97; + name = "Tactical Map Display"; + pixel_y = 21 + }, +/obj/structure/noticeboard{ + pixel_x = -21; + pixel_y = 30 + }, +/turf/open/floor/almayer, +/area/golden_arrow/briefing) "va" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cargo_container/wy/mid{ @@ -5699,34 +5639,6 @@ "vb" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/dorms) -"vd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/structure/prop{ - icon = 'icons/obj/structures/props/almayer_props.dmi'; - icon_state = "targeting_system"; - name = "\improper Broken AN/AAQ-178 Weapon Targeting System"; - desc = "A targeting system for dropships. It improves firing accuracy on laser targets. Far beyond repair."; - pixel_y = 3; - pixel_x = 7; - density = 1; - layer = 3.1 - }, -/obj/item/prop/almayer/flight_recorder{ - pixel_x = -8; - pixel_y = 9 - }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_x = 7; - pixel_y = 15; - layer = 3.11 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "vf" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -5745,6 +5657,16 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"vk" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "bay2door"; + name = "\improper Weapons Bay Two Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "vl" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -5868,15 +5790,6 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) -"vE" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access{ - pixel_y = 24; - density = 0 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/golden_arrow/medical) "vF" = ( /obj/structure/machinery/door/poddoor/almayer, /obj/structure/pipes/standard/simple/hidden/supply, @@ -5893,14 +5806,6 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"vJ" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "vK" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 8 @@ -5918,100 +5823,82 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) -"vO" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/camera{ - pixel_y = 9; - pixel_x = -7 +"vP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/computer/cameras/almayer/vehicle{ + dir = 8; + network = list("Golden Arrow","Vehicle","Midway"); + pixel_x = 17 }, -/obj/item/device/camera_film{ - pixel_y = 4 +/obj/structure/machinery/prop/almayer/CICmap{ + density = 0; + dir = 8; + icon_state = "shuttle"; + layer = 2.97; + name = "Tactical Map Display"; + pixel_x = 17; + pixel_y = 14 }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/dorms) -"vQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/cable/heavyduty{ - icon_state = "1-2" +/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ + dir = 8; + icon_state = "cameras_old"; + name = "Midway Remote Control Console"; + pixel_x = 17; + pixel_y = -14; + shuttleId = "dropship_midway" + }, +/obj/structure/surface/table/reinforced/almayer_B{ + layer = 2.01; + pixel_x = 14 }, /obj/structure/machinery/light{ - dir = 4 + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/prep_hallway) -"vS" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) -"vT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/target{ - name = "punching bag"; - pixel_y = 16; - layer = 3.1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) -"vV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/prop{ - density = 1; - icon_state = "pipe_d"; - name = "refueling pump"; - desc = "A pump used for refueling the dropship."; - pixel_x = -4; - pixel_y = -5; - layer = 2.7 - }, -/obj/effect/decal/siding{ - icon_state = "siding2" - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"vZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/item/clothing/glasses/hud/health{ + pixel_x = 7; + pixel_y = 5 }, /turf/open/floor/almayer, -/area/golden_arrow/dorms) -"wa" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing1" +/area/golden_arrow/platoon_commander_rooms) +"vQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 +/obj/structure/machinery/light{ + dir = 4 }, -/area/golden_arrow/hangar) -"wb" = ( +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/prep_hallway) +"vR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/bedroll{ - pixel_x = -2; - color = "#333333"; - name = "gym mat"; buckle_lying = null; can_buckle = 0; + color = "#333333"; + desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise."; foldabletype = null; - desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise." + name = "gym mat"; + pixel_x = -2 }, /turf/open/floor/almayer{ dir = 4; icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"vS" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) +"vZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) "wd" = ( /obj/structure/machinery/power/terminal, /turf/open/floor/plating/plating_catwalk, @@ -6053,10 +5940,43 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"wh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/crushed_cup{ + pixel_x = 6; + pixel_y = -10 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) +"wi" = ( +/obj/structure/ship_ammo/minirocket, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ship_ammo/minirocket{ + layer = 3.1; + pixel_y = 9 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "wj" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) +"wm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/cargo_container/wy/mid{ + opacity = 0; + pixel_y = -17 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "wn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -6064,10 +5984,12 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"wp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +"wr" = ( +/obj/structure/machinery/floodlight/landing/floor{ + pixel_x = 3 + }, +/obj/structure/machinery/landinglight/ds1{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -6084,53 +6006,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"wv" = ( -/obj/structure/cable{ - layer = 2.36; - pixel_y = 12; - pixel_x = -3 - }, -/obj/structure/cable{ - layer = 2.36; - pixel_y = 12; - pixel_x = -1 - }, -/obj/structure/cable{ - layer = 2.36; - pixel_y = 12; - pixel_x = 1 - }, -/obj/structure/cable{ - layer = 2.36; - pixel_y = 12; - pixel_x = 3 - }, -/obj/structure/cable{ - icon_state = "0-2"; - layer = 2.36; - pixel_y = -3; - pixel_x = -3 - }, -/obj/structure/cable{ - icon_state = "0-2"; - layer = 2.36; - pixel_y = -3; - pixel_x = -1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - layer = 2.36; - pixel_y = -3; - pixel_x = 1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - layer = 2.36; - pixel_y = -3; - pixel_x = 3 - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) "ww" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -6152,6 +6027,22 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"wy" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "apc1blastdoor"; + name = "vehicle bay blast door control"; + pixel_y = 28 + }, +/obj/structure/machinery/door_control/brbutton{ + id = "apcbayrailing1"; + name = "vehicle bay railing control"; + pixel_x = 13; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "wB" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -6188,6 +6079,13 @@ icon_state = "test_floor4" }, /area/golden_arrow/cryo_cells) +"wE" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ + req_access = list(); + req_one_access_txt = "8;12;39;40" + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "wF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/platform/stair_cut, @@ -6222,42 +6120,37 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/shared_office) -"wL" = ( +"wP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -11; - pixel_y = 14 - }, -/obj/item/tool/hand_labeler{ - pixel_y = 2; - pixel_x = -3 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "apcbayrailing1" }, -/obj/item/spacecash/c10{ - pixel_x = 11; - pixel_y = 2; - layer = 2.7 +/turf/open/floor/almayer{ + dir = 4; + icon_state = "black" }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) +/area/golden_arrow/hangar) "wQ" = ( /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) -"wR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; +"wU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver{ + icon_state = "screwdriver4"; pixel_x = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -14; + pixel_y = 15 + }, +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 1 }, /turf/open/floor/almayer, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonprep) "wV" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -6265,17 +6158,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"wW" = ( -/obj/structure/prop{ - name = "\improper cozy case"; - desc = "A rather cozy case you can sit on. The label says it's full of pillows - though it's probably empty."; - icon_state = "case"; - icon = 'icons/obj/structures/crates.dmi'; - can_buckle = 1; - pixel_y = 6 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "wX" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -6305,54 +6187,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"xd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/medical/bruise_pack{ - pixel_y = 7; - pixel_x = -12 - }, -/obj/item/stack/medical/ointment{ - pixel_y = 12; - pixel_x = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) -"xf" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 9 - }, -/obj/item/reagent_container/food/snacks/cracker{ - pixel_y = 7; - pixel_x = -2 - }, -/obj/item/reagent_container/food/snacks/cracker{ - pixel_y = 9 +"xi" = ( +/obj/structure/bed{ + can_buckle = 0 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +/obj/item/bedsheet/rd, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/magazine/book/theartofwar{ + layer = 4.1; + pixel_x = -1 }, /turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/platoon_commander_rooms) "xl" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"xn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing1" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 - }, -/area/golden_arrow/hangar) "xp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -6372,26 +6224,6 @@ icon_state = "logo_directional1" }, /area/golden_arrow/hangar) -"xu" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -8; - pixel_y = 28 - }, -/obj/structure/machinery/computer/ares_console{ - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) -"xx" = ( -/obj/structure/sign/banners/maximumeffort{ - pixel_y = -5; - desc = "A large banner strung up on the wall intended to give the marines a boost in confidence." - }, -/turf/closed/wall/almayer, -/area/golden_arrow/cryo_cells) "xy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -6433,21 +6265,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"xC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/dam/crane/cargo{ - dir = 4; - desc = "Standard cargo crane used by the USCM. Looks like this one has replacement parts for the Tripoli on it. You probably couldn't name half of these." - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"xF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "xI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -6474,31 +6291,16 @@ /obj/item/tool/warning_cone, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"xU" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/barricade/metal{ - dir = 8; - pixel_x = -1 - }, -/obj/structure/barricade/metal{ +"xR" = ( +/obj/structure/machinery/door/poddoor/almayer{ dir = 4; - pixel_x = 1 - }, -/obj/structure/barricade/metal{ - dir = 8; - pixel_y = 8; - pixel_x = -1 + id = "apc2blastdoor"; + name = "\improper Vehicle Bay Two Blast Door" }, -/obj/structure/barricade/metal{ - dir = 4; - pixel_y = 8; - pixel_x = 1 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/obj/structure/curtain/red, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/cryo_cells) +/area/golden_arrow/hangar) "xV" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -6584,6 +6386,17 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) +"ym" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "black" + }, +/area/golden_arrow/hangar) "yr" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -6596,6 +6409,36 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"ys" = ( +/obj/item/storage/toolbox/mechanical/green{ + pixel_x = 2; + pixel_y = -14 + }, +/obj/structure/prop{ + density = 1; + desc = "A fuel enhancement system for dropships. It improves the thrust produced by the fuel combustion for faster travels. Full of bullet holes and probably needs to be replaced. The label says it was manufactured in 2171"; + icon = 'icons/obj/structures/props/almayer_props64.dmi'; + icon_state = "fuel_enhancer"; + name = "Damaged FS/FES-3 fuel enhancer"; + pixel_y = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/hangar) +"yt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "yx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -6606,6 +6449,12 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"yA" = ( +/obj/structure/machinery/landinglight/ds1/delayone, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "yB" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -6616,14 +6465,18 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"yG" = ( +"yF" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 1; - pixel_x = -1 + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/golden_arrow/hangar) "yK" = ( /obj/structure/machinery/floodlight/landing, @@ -6631,43 +6484,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"yN" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/tableflag{ - pixel_x = -9; - pixel_y = 2 - }, -/obj/item/folder/black{ - icon_state = "folder_black_white"; - pixel_y = 14; - pixel_x = 2 - }, -/obj/item/reagent_container/food/drinks/cans/souto/lime{ - pixel_y = 3; - pixel_x = 5 - }, -/turf/open/floor/almayer, -/area/golden_arrow/shared_office) -"yO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/item/facepaint/green{ - pixel_y = 12; - pixel_x = 2 - }, -/obj/item/facepaint/black{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/facepaint/brown{ - pixel_x = -2; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "yQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -6705,33 +6521,6 @@ "yX" = ( /turf/open/floor/plating, /area/golden_arrow/hangar) -"yY" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 4 - }, -/area/golden_arrow/hangar) -"yZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/almayer/chaff_launcher{ - pixel_y = 9; - pixel_x = 3 - }, -/obj/item/prop/almayer/flare_launcher{ - pixel_y = 19; - pixel_x = 5 - }, -/obj/item/prop/almayer/handheld1{ - pixel_y = -8; - pixel_x = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/engineering) "za" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -6750,17 +6539,10 @@ icon_state = "cargo" }, /area/golden_arrow/briefing) -"zi" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "blackcorner"; - dir = 1 +"zg" = ( +/turf/open/floor/almayer/uscm{ + dir = 4; + icon_state = "logo_directional1" }, /area/golden_arrow/hangar) "zj" = ( @@ -6795,6 +6577,22 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) +"zm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver{ + layer = 3.03; + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/tool/wirecutters{ + pixel_y = -7 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "zq" = ( /obj/structure/machinery/shower{ dir = 8 @@ -6804,6 +6602,19 @@ "zs" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/briefing) +"zt" = ( +/obj/structure/cargo_container/kelland/left{ + layer = 3; + opacity = 0 + }, +/obj/structure/cargo_container/kelland/left{ + opacity = 0; + pixel_y = 22 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "zw" = ( /obj/structure/window/framed/almayer, /obj/structure/pipes/standard/simple/hidden/supply, @@ -6831,6 +6642,25 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"zB" = ( +/obj/structure/closet/crate/trashcart{ + pixel_y = 11 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/sign/safety/coffee{ + pixel_x = 13; + pixel_y = 29 + }, +/obj/item/trash/candy, +/obj/item/trash/burger, +/obj/item/trash/cigbutt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) "zC" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -6874,31 +6704,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/prep_hallway) -"zI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/squad_sergeant{ - req_access_txt = "32;39"; - req_one_access = list(); - name = "squad one sergeant locker" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/platoonprep) -"zJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 1; - pixel_x = -1 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "zL" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -6923,20 +6728,6 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"zV" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/trash/plate{ - pixel_y = 4; - pixel_x = -4 - }, -/turf/open/floor/almayer, -/area/golden_arrow/cryo_cells) "zX" = ( /obj/structure/bed/chair, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -6962,6 +6753,24 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) +"Ab" = ( +/obj/structure/cable{ + layer = 2.45; + pixel_x = 7; + pixel_y = 1 + }, +/obj/structure/prop{ + color = "#b30000"; + icon = 'icons/obj/pipes/power_cond_white.dmi'; + icon_state = "0-8"; + name = "cable"; + pixel_x = 2; + pixel_y = 2 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin14" + }, +/area/golden_arrow/hangar) "Af" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -6998,25 +6807,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"Aj" = ( -/obj/structure/closet/secure_closet/smartgunner{ - req_access_txt = "14;39"; - req_one_access = list(); - name = "squad one smartgunner locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/platoonprep) -"An" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/wy_chips_pepper{ - pixel_y = 5; - pixel_x = -5 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "Ao" = ( /obj/effect/decal/strata_decals/grime/grime3, /obj/structure/pipes/standard/simple/hidden/supply, @@ -7025,6 +6815,31 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/prep_hallway) +"Aq" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger{ + pixel_x = 5; + pixel_y = -10 + }, +/obj/item/smartgun_battery{ + pixel_x = 4; + pixel_y = -5 + }, +/obj/item/prop/magazine{ + desc = "A copy of Soldier of Fortune magazine. On the cover is a stylized imagine of a motion tracker in use, with the headline 'Combat Awareness in the 22nd Century'. The article covers the advancement in sensor technology that has made combat between peer nations like the UA and UPP increasingly lethal to those on the ground. Flipping through the magazine you see article titles such as 'Arsenal: The M2C Heavy Machinegun', and 'The Future War: advancements in Cyberdyne Systems combat AI'. At the back of the magazine is an extensive list of advertisements for private contractors and wares."; + icon_state = "poster8"; + name = "Soldier Of Fortune: Issue March 2182"; + pixel_x = 7; + pixel_y = 15 + }, +/obj/item/clipboard{ + pixel_x = -7; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/platoonprep) "As" = ( /obj/structure/pipes/vents/pump, /obj/structure/disposalpipe/segment{ @@ -7043,25 +6858,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"Av" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/bodybags{ - pixel_y = 11; - pixel_x = -5 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 3; - pixel_x = -2 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_y = 18; - pixel_x = 10 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "Aw" = ( /obj/structure/bed{ can_buckle = 0; @@ -7086,6 +6882,22 @@ /obj/structure/girder/displaced, /turf/open/floor/plating, /area/golden_arrow/hangar) +"Ax" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/tray{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/storage/box/cups{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ + pixel_x = 14; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/golden_arrow/cryo_cells) "Ay" = ( /obj/structure/foamed_metal, /turf/open/floor/plating, @@ -7107,12 +6919,13 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"AG" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = -6; - pixel_x = 2 +"AJ" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/golden_arrow/hangar) "AK" = ( /obj/structure/machinery/cryopod, @@ -7134,13 +6947,31 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"AO" = ( -/obj/structure/machinery/floodlight/landing/floor, -/obj/structure/machinery/landinglight/ds1, +"AM" = ( +/obj/structure/machinery/door/airlock/maintenance/colony{ + dir = 1; + name = "\improper Power Substation"; + req_one_access = null + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/golden_arrow/hangar) +/area/golden_arrow/engineering) +"AN" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -18 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "AQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/command/capt{ @@ -7160,15 +6991,28 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"AX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 +"AV" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/tray{ + pixel_x = -5; + pixel_y = 6 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) +/obj/item/trash/plate{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/trash/plate{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/trash/plate{ + pixel_x = -4; + pixel_y = 9 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/cryo_cells) "AY" = ( /obj/structure/foamed_metal, /turf/open/floor/plating, @@ -7255,48 +7099,10 @@ /obj/structure/closet/secure_closet/surgical{ pixel_x = 30 }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/golden_arrow/synthcloset) -"Bv" = ( -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Vehicle Bay Two Blast Door"; - id = "apc2blastdoor" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/hangar) -"Bx" = ( -/obj/structure/prop{ - icon = 'icons/obj/pipes/power_cond_white.dmi'; - icon_state = "8-9"; - color = "#b30000"; - pixel_y = -15; - pixel_x = 4; - layer = 2.9; - name = "cable" - }, -/obj/structure/prop{ - icon = 'icons/obj/pipes/power_cond_white.dmi'; - icon_state = "1-4"; - color = "#b30000"; - name = "cable"; - pixel_x = -9 - }, -/obj/structure/prop{ - icon = 'icons/obj/pipes/power_cond_white.dmi'; - icon_state = "8-10"; - color = "#b30000"; - name = "cable"; - pixel_x = 21 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin14" - }, -/area/golden_arrow/hangar) +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/golden_arrow/synthcloset) "By" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/case/small, @@ -7312,6 +7118,17 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"BA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/railing{ + dir = 8; + id = "apcbayrailing2" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "black" + }, +/area/golden_arrow/hangar) "BC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -7331,6 +7148,13 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) +"BF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "BH" = ( /obj/effect/landmark/start/marine/medic/alpha, /obj/effect/landmark/late_join/alpha, @@ -7353,23 +7177,6 @@ icon_state = "mono" }, /area/golden_arrow/cryo_cells) -"BL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door_control{ - pixel_y = -19; - id = "synthbay"; - name = "storage bay door-control" - }, -/turf/open/floor/almayer, -/area/golden_arrow/synthcloset) -"BP" = ( -/turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 6 - }, -/area/golden_arrow/hangar) "BQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -7379,40 +7186,35 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"BR" = ( +"BS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 }, -/obj/structure/prop/dam/crane, -/obj/structure/prop{ - icon = 'icons/obj/structures/props/almayer_props64.dmi'; - icon_state = "cooling_system"; - name = "Damaged FS/ACS-9 cooling system"; - desc = "A cooling system for the Tripoli. It produces additional cooling reducing delays between launch. The pipes are crooked and bent, hoses are sliced open, and that's not even mentioning the bullet holes. Looks to be an older model as well."; - density = 1; - pixel_y = 16; - layer = 3.1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) +/area/golden_arrow/cryo_cells) "BT" = ( /turf/closed/shuttle/midway/transparent{ icon_state = "86"; name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"BU" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/almayer/comp_open{ - pixel_y = 6; - pixel_x = 2 +"BZ" = ( +/obj/item/tool/screwdriver{ + icon_state = "screwdriver3"; + layer = 3.03; + pixel_x = -4; + pixel_y = 7 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar) "Ca" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -7421,6 +7223,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"Cb" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_one_access = list(); + req_one_access_txt = "8;12;39;40" + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "Cc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, @@ -7465,14 +7274,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"Cj" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "Ck" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -7510,6 +7311,21 @@ dir = 9 }, /area/golden_arrow/supply) +"Cr" = ( +/obj/item/stack/catwalk{ + pixel_x = 4 + }, +/obj/item/stack/catwalk{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/structure/machinery/landinglight/ds1{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Cu" = ( /obj/structure/bed/chair{ dir = 8 @@ -7533,33 +7349,16 @@ icon_state = "test_floor5" }, /area/golden_arrow/synthcloset) -"CA" = ( -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger{ - pixel_y = -14 - }, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/trash/cigbutt{ - pixel_y = 5; - pixel_x = 4 - }, -/obj/item/trash/cigbutt{ - pixel_y = 15; - pixel_x = -4 +"CD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer, -/area/golden_arrow/dorms) -"CC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -7568,6 +7367,19 @@ "CE" = ( /turf/closed/wall/almayer, /area/golden_arrow/medical) +"CF" = ( +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blackcorner" + }, +/area/golden_arrow/hangar) "CG" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/pipes/standard/simple/hidden/supply, @@ -7620,6 +7432,24 @@ icon_state = "cargo" }, /area/golden_arrow/cryo_cells) +"CN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/largecrate/random/case/small{ + layer = 3.1; + pixel_x = 3; + pixel_y = 35 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "CP" = ( /obj/structure/machinery/floodlight/landing/floor{ pixel_x = 3 @@ -7634,33 +7464,6 @@ name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"CV" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{ - name = "\improper Tripoli" - }, -/obj/item/tool/screwdriver{ - pixel_y = 5; - pixel_x = -4; - layer = 3.03; - icon_state = "screwdriver5" - }, -/obj/item/trash/eat{ - pixel_x = 10 - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"CW" = ( -/obj/structure/ship_ammo/minirocket, -/obj/effect/decal/cleanable/dirt, -/obj/structure/ship_ammo/minirocket{ - pixel_y = 9; - layer = 3.1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "CX" = ( /obj/structure/gun_rack/m41, /turf/open/floor/almayer, @@ -7672,6 +7475,53 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) +"Db" = ( +/obj/structure/cargo_container/kelland/right{ + opacity = 0 + }, +/obj/structure/cargo_container/kelland/right{ + opacity = 0; + pixel_y = 22 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) +"Dc" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "equipment_conny"; + name = "\improper Squad Two Equipment Locker" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) +"Df" = ( +/obj/structure/largecrate/random/case/double{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/structure/largecrate/random/case/double{ + layer = 3.1; + pixel_x = 6; + pixel_y = -7 + }, +/obj/structure/largecrate/random/mini/small_case{ + layer = 3.1; + pixel_x = 14; + pixel_y = 24 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/golden_arrow/hangar) "Dj" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7684,21 +7534,43 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"Dn" = ( +/obj/structure/surface/rack{ + pixel_y = 19 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/medical/ointment{ + pixel_x = 2; + pixel_y = 34 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/cryo_cells) +"Do" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/device/camera_film{ + pixel_y = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/dorms) "Dp" = ( /turf/closed/shuttle/dropship1{ icon_state = "97"; name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"Dt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"Dq" = ( +/obj/structure/sign/banners/maximumeffort{ + desc = "A large banner strung up on the wall intended to give the marines a boost in confidence."; + pixel_y = -5 }, -/area/golden_arrow/hangar) +/turf/closed/wall/almayer, +/area/golden_arrow/cryo_cells) "Dv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/heavyduty{ @@ -7710,15 +7582,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoonprep) -"Dz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "apcbayrailing1" +"Dy" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "black"; - dir = 4 + icon_state = "plate" }, /area/golden_arrow/hangar) "DA" = ( @@ -7787,6 +7656,18 @@ }, /turf/open/floor/almayer, /area/golden_arrow/synthcloset) +"DK" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop{ + desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines."; + icon = 'icons/obj/items/paper.dmi'; + icon_state = "newspaper"; + name = "The Marine Corps Gazette"; + pixel_x = 6; + pixel_y = 18 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoon_commander_rooms) "DL" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -7822,6 +7703,25 @@ "DQ" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/platoonprep) +"DT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "apcbayrailing1" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "black" + }, +/area/golden_arrow/hangar) +"DV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/almayer{ + id = "synthbay"; + name = "\improper Synthetic Storage Bay" + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "DY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/pump{ @@ -7841,17 +7741,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"Eb" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "Ef" = ( /turf/open/floor/almayer{ icon_state = "cargo" @@ -7878,6 +7767,30 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"Ej" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/mk1{ + layer = 3.1; + pixel_x = 3; + pixel_y = 13 + }, +/obj/item/facepaint/sunscreen_stick{ + layer = 3.2; + pixel_x = -2; + pixel_y = 2 + }, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 24; + serial_number = 11 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/platoonprep) "Ek" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable/heavyduty{ @@ -7885,19 +7798,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"El" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/cargo_container/wy/mid{ - pixel_y = -17; - opacity = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "Em" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/cable{ @@ -7940,57 +7840,6 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"Er" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ - req_one_access_txt = "8;12;39;40"; - req_access = list() - }, -/obj/item/reagent_container/food/drinks/cans/souto/lime{ - pixel_y = 21; - pixel_x = 10 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) -"Et" = ( -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Weapons Bay Two Blast Door"; - id = "bay2door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/hangar) -"Ev" = ( -/obj/structure/machinery/microwave{ - density = 0; - pixel_y = 9 - }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = -3; - pixel_x = 9 - }, -/obj/item/storage/box/donkpockets{ - pixel_y = 22; - pixel_x = 4 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/cryo_cells) -"Ew" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/reinforced/almayer_B{ - pixel_x = 14; - layer = 2.01 - }, -/obj/item/ashtray/plastic{ - pixel_y = -3; - pixel_x = 10 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) "Ez" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -8035,6 +7884,18 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"EJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/railing{ + id = "apcbayrailing2" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "black" + }, +/area/golden_arrow/hangar) "EK" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "cargolock"; @@ -8048,18 +7909,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"EM" = ( -/obj/structure/prop{ - icon = 'icons/obj/pipes/power_cond_white.dmi'; - icon_state = "4-5"; - color = "#b30000"; - pixel_x = 5; - name = "cable" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin14" - }, -/area/golden_arrow/hangar) "EP" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -8130,20 +7979,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"Fb" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -18 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) -"Fd" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "Fe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -8199,14 +8034,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) -"Fm" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "Fn" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -8261,33 +8088,29 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"Fu" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = 27 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 14; - pixel_y = 27 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - pixel_y = 18; - layer = 3.6; - density = 0 +"Fs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, +/turf/open/floor/almayer, /area/golden_arrow/hangar) "Fw" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/area/golden_arrow/hangar) +/turf/open/floor/almayer, +/area/golden_arrow/synthcloset) "FA" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop{ @@ -8321,6 +8144,21 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"FD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/ashtray/plastic{ + pixel_x = -10; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "FE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8381,17 +8219,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"FT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/squad_sergeant{ - req_access_txt = "32;40"; - req_one_access = list(); - name = "squad two sergeant locker" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/platoonprep) "FU" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_y = -29 @@ -8415,18 +8242,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"FX" = ( -/obj/structure/surface/table/almayer, -/obj/structure/largecrate/random/case{ - pixel_y = 11 - }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_x = 4; - pixel_y = 15; - layer = 3.11 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "FY" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -8451,6 +8266,36 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Gd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "equipment_conny"; + name = "\improper Squad One Equipment Locker" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) +"Ge" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/bed/bedroll{ + buckle_lying = null; + can_buckle = 0; + color = "#333333"; + desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise."; + foldabletype = null; + name = "gym mat"; + pixel_y = -4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Gg" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8459,21 +8304,27 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/hangar) -"Gi" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light, -/obj/structure/prop{ - icon = 'icons/obj/structures/props/almayer_props.dmi'; - icon_state = "lz_detector"; - name = "\improper Damaged AN/AVD-60 LZ detector"; - desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone. This thing probably never even worked."; - density = 1; - layer = 3.1 +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/hangar) +"Gj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/bodybags{ + pixel_x = -5; + pixel_y = 11 + }, +/obj/item/storage/box/bodybags{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 10; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/medical) "Gk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -8487,6 +8338,15 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/platoonprep) +"Gn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Gp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -8521,6 +8381,30 @@ icon_state = "plate" }, /area/golden_arrow/engineering) +"Gw" = ( +/obj/structure/closet/secure_closet/marine_personal{ + job = "Platoon Sergeant"; + pixel_x = -7 + }, +/obj/structure/closet/secure_closet/marine_personal{ + job = "Platoon Corpsman"; + pixel_x = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) +"Gy" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/effect/spawner/prop_gun/m41aMK1{ + pixel_x = 6; + pixel_y = -3 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "Gz" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -8533,11 +8417,12 @@ "GA" = ( /turf/closed/shuttle/elevator, /area/golden_arrow/supply) -"GD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 1 +"GF" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, /area/golden_arrow/hangar) "GG" = ( @@ -8572,6 +8457,16 @@ /obj/item/tool/wirecutters, /turf/open/floor/almayer, /area/golden_arrow/synthcloset) +"GL" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/fire{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/cobweb2/dynamic, +/obj/item/storage/firstaid/regular, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "GM" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ @@ -8616,6 +8511,13 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"GV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "GW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/heavyduty{ @@ -8642,12 +8544,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"Hc" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "He" = ( /obj/structure/platform_decoration{ dir = 4 @@ -8675,60 +8571,31 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"Hh" = ( -/obj/structure/sink{ - pixel_y = 24; - layer = 3.1 +"Hg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/mirror{ - pixel_y = 35; - pixel_x = -1 +/obj/item/toy/plush/therapy/blue{ + pixel_x = 6; + pixel_y = 9 }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) +/obj/item/toy/plush/therapy/random_color, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "Hi" = ( /obj/structure/cargo_container/arious/mid, /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"Hj" = ( -/obj/structure/largecrate/supply/medicine/medkits{ - pixel_y = 9; - pixel_x = -11 - }, -/obj/structure/largecrate/supply/medicine/medkits{ - pixel_y = 9; - pixel_x = 14 - }, -/obj/structure/largecrate/supply/medicine/medkits{ - pixel_y = 24; - pixel_x = 8; - layer = 3.1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "Hk" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck/uno, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/dorms) -"Hl" = ( -/obj/structure/cargo_container/kelland/left{ - layer = 3; - opacity = 0 - }, -/obj/structure/cargo_container/kelland/left{ - pixel_y = 22; - opacity = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "Hm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -8741,20 +8608,19 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) -"Hn" = ( -/obj/structure/machinery/light{ - dir = 1 +"Ho" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/catwalk{ + pixel_x = 2; + pixel_y = -9 }, -/obj/structure/surface/table/almayer, -/obj/item/storage/briefcase/inflatable{ - pixel_y = 10 +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 }, -/obj/item/storage/briefcase/inflatable{ - pixel_y = 5; - pixel_x = 3 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar) "Hp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -8779,6 +8645,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/golden_arrow/platoon_commander_rooms) +"Hy" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/plate{ + pixel_x = 4; + pixel_y = 13 + }, +/obj/item/trash/plate{ + pixel_x = -3 + }, +/turf/open/floor/almayer, +/area/golden_arrow/cryo_cells) "HA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -8796,6 +8673,17 @@ name = "\improper Tripoli" }, /area/golden_arrow/hangar) +"HE" = ( +/obj/structure/largecrate/supply/ammo{ + fill_from_loc = 1; + name = "sentry crate" + }, +/obj/item/ammo_magazine/sentry{ + layer = 3.01 + }, +/obj/item/defenses/handheld/sentry, +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) "HF" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -8810,21 +8698,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"HJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/lucky_strikes_4{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/storage/fancy/cigar/matchbook{ - pixel_y = 6; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/platoonprep) "HK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable{ @@ -8949,26 +8822,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) -"Ib" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/briefing) "Id" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, @@ -9015,33 +8868,10 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"Im" = ( -/obj/item/storage/box/guncase/pumpshotgun/special{ - pixel_y = 4 - }, -/obj/item/storage/box/guncase/flamer/special{ - pixel_y = 10; - layer = 3.1 - }, -/obj/structure/surface/rack, -/turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) -"In" = ( -/obj/item/prop/almayer/comp_open{ - pixel_y = 4; - pixel_x = 40 - }, -/obj/structure/prop{ - icon = 'icons/obj/pipes/power_cond_white.dmi'; - icon_state = "4-5"; - color = "#b30000"; - pixel_x = 5; - pixel_y = 2; - layer = 2.8; - name = "cable" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin14" +"Iq" = ( +/turf/open/floor/almayer/uscm{ + dir = 9; + icon_state = "logo_directional1" }, /area/golden_arrow/hangar) "Ir" = ( @@ -9081,18 +8911,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) -"Ix" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing1" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 - }, -/area/golden_arrow/hangar) "Iz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -9105,6 +8923,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/prep_hallway) +"IA" = ( +/turf/open/floor/almayer/uscm{ + dir = 6; + icon_state = "logo_directional1" + }, +/area/golden_arrow/hangar) "IB" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -9137,22 +8961,6 @@ icon_state = "plate" }, /area/golden_arrow/engineering) -"IG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/sign/safety/terminal{ - pixel_y = -26; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "cargo_arrow" - }, -/area/golden_arrow/prep_hallway) "IH" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -9176,12 +8984,33 @@ /obj/structure/cable{ layer = 2.36 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/prep_hallway) +"IL" = ( +/obj/structure/cargo_container/wy/right{ + opacity = 0; + pixel_y = -17 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/device/flashlight/lamp/on{ + layer = 4.2; + pixel_x = 3; + pixel_y = 19 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/prep_hallway) +/area/golden_arrow/hangar) "IM" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -9221,18 +9050,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/briefing) -"IW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 4 - }, -/area/golden_arrow/hangar) "IX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -9263,49 +9080,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"Jc" = ( -/obj/structure/bed/bedroll{ - pixel_x = -2; - color = "#333333"; - name = "gym mat"; - buckle_lying = null; - can_buckle = 0; - foldabletype = null; - pixel_y = -3; - desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise." - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "cargo_arrow" - }, -/area/golden_arrow/hangar) "Jd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) -"Ji" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - name = "First Platoon Ready Bay Blast Door"; - closed_layer = 3.3; - layer = 3.3; - open_layer = 3.3; - id = "squadblastdoor" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "Jk" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -9364,6 +9143,23 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) +"Jy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/stool{ + pixel_x = -1; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/engineering) "JB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -9460,6 +9256,20 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) +"JO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "JQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -9477,16 +9287,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) -"JV" = ( -/obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ - name = "non-functional maintenance airlock"; - layer = 2.1 +"JT" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 8; + id = "apcbayrailing1" }, -/obj/structure/sign/safety/airlock{ - pixel_y = 1; - pixel_x = 8 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "black" }, -/turf/open/floor/almayer, /area/golden_arrow/hangar) "JW" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -9496,23 +9305,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"JZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/item/stool{ - pixel_y = 12; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/golden_arrow/engineering) "Kc" = ( /obj/structure/machinery/light{ dir = 8 @@ -9521,6 +9313,20 @@ icon_state = "mono" }, /area/golden_arrow/supply) +"Ke" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Kf" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -9547,19 +9353,6 @@ icon_state = "rasputin15" }, /area/golden_arrow/hangar) -"Ki" = ( -/obj/structure/closet/secure_closet, -/obj/structure/machinery/prop{ - desc = "This stylized recruitment poster for the USCM depicts a the head of a screaming eagle breaking into orbit, surrounded by flames. Death from above."; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster41"; - name = "USCM recruitment poster"; - layer = 3.5; - pixel_y = 34; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) "Kk" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/almayer, @@ -9586,19 +9379,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"Kx" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "apcbayrailing1" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 4 - }, -/area/golden_arrow/hangar) "Ky" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -9652,17 +9432,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"KG" = ( -/obj/structure/machinery/prop{ - density = 1; - icon_state = "pipe_d"; - name = "refueling pump"; - desc = "A pump used for refueling the dropship."; - pixel_y = -5; - layer = 2.7 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "KJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -9673,13 +9442,64 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"KN" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +"KK" = ( +/obj/structure/cable{ + layer = 2.36; + pixel_x = -3; + pixel_y = 12 }, -/area/golden_arrow/medical) +/obj/structure/cable{ + layer = 2.36; + pixel_x = -1; + pixel_y = 12 + }, +/obj/structure/cable{ + layer = 2.36; + pixel_x = 1; + pixel_y = 12 + }, +/obj/structure/cable{ + layer = 2.36; + pixel_x = 3; + pixel_y = 12 + }, +/obj/structure/cable{ + icon_state = "0-2"; + layer = 2.36; + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "0-2"; + layer = 2.36; + pixel_x = -1; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "0-2"; + layer = 2.36; + pixel_x = 1; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "0-2"; + layer = 2.36; + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) +"KO" = ( +/obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ + layer = 2.1; + name = "non-functional maintenance airlock" + }, +/obj/structure/sign/safety/airlock{ + pixel_x = 8; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "KP" = ( /turf/closed/shuttle/midway/transparent{ icon_state = "29"; @@ -9766,30 +9586,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"Ld" = ( -/obj/structure/machinery/floodlight/landing/floor, -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) -"Le" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 1; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/golden_arrow/medical) "Lf" = ( /turf/open/shuttle/elevator, /area/golden_arrow/supply) @@ -9808,6 +9604,19 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"Lh" = ( +/obj/structure/machinery/power/terminal, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/cable_coil, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/tool/warning_cone{ + pixel_x = -15; + pixel_y = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/engineering) "Ll" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -9844,16 +9653,38 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) +"Lr" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) +"Lt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + closed_layer = 3.3; + dir = 4; + id = "squadblastdoor"; + layer = 3.3; + name = "First Platoon Ready Bay Blast Door"; + open_layer = 3.3 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, -/area/golden_arrow/cryo_cells) -"Lr" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/golden_arrow/hangar) +/area/golden_arrow/platoonarmory) "Lu" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -9878,12 +9709,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/shared_office) -"Lz" = ( -/turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 4 - }, -/area/golden_arrow/hangar) "LA" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -9893,6 +9718,14 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"LC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/ares_console{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) "LD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -9935,16 +9768,6 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) -"LK" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "apcbayrailing1" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 8 - }, -/area/golden_arrow/hangar) "LL" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -9953,45 +9776,20 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"LM" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer{ - icon_state = "blackcorner"; - dir = 8 +"LO" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/CICmap{ + layer = 4; + pixel_x = -1; + pixel_y = 5 }, +/turf/open/floor/almayer, /area/golden_arrow/hangar) "LQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) -"LS" = ( -/obj/structure/cargo_container/wy/left{ - pixel_y = -17; - opacity = 0 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/item/toy/plush/therapy/red{ - desc = "An unapproved bootleg copy of the patented Sergeant Huggs. Looks like he's seen better days."; - force = 15; - layer = 4.1; - name = "Discharged Huggs"; - pixel_y = 32; - throwforce = 15; - pixel_x = 5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "LU" = ( /obj/structure/platform{ dir = 1 @@ -10022,43 +9820,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"LY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - network = list("Golden Arrow","Vehicle","Midway"); - pixel_x = 17; - dir = 8 - }, -/obj/structure/machinery/prop/almayer/CICmap{ - density = 0; - dir = 8; - icon_state = "shuttle"; - layer = 2.97; - name = "Tactical Map Display"; - pixel_x = 17; - pixel_y = 14 - }, -/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - name = "Midway Remote Control Console"; - shuttleId = "dropship_midway"; - icon_state = "cameras_old"; - dir = 8; - pixel_x = 17; - pixel_y = -14 - }, -/obj/structure/surface/table/reinforced/almayer_B{ - pixel_x = 14; - layer = 2.01 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 5; - pixel_x = 7 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) "Ma" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -10099,12 +9860,76 @@ icon_state = "plate" }, /area/golden_arrow/briefing) +"Mi" = ( +/obj/structure/machinery/landinglight/ds1, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) +"Mj" = ( +/obj/item/stack/sheet/metal, +/obj/item/stack/rods{ + pixel_x = -13; + pixel_y = 16 + }, +/obj/effect/decal/siding{ + icon_state = "siding8" + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) +"Mk" = ( +/obj/effect/decal/strata_decals/grime/grime1, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/machinery/disposal{ + density = 0; + layer = 3.2; + pixel_y = 12 + }, +/obj/structure/sign/poster{ + desc = "The Armat Battlefield Systems Model 41 Derivative 'A' Pulse Rifle Mark One. The only pinup you'll ever need."; + icon_state = "poster15"; + name = "pulse rifle pinup"; + pixel_x = -27; + pixel_y = 6 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) +"Mm" = ( +/obj/structure/sink{ + layer = 3.1; + pixel_y = 24 + }, +/obj/structure/mirror{ + pixel_x = -1; + pixel_y = 35 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/cryo_cells) "Mn" = ( /turf/closed/shuttle/midway/transparent{ icon_state = "80"; name = "\improper Tripoli" }, /area/golden_arrow/hangar) +"Mr" = ( +/obj/structure/largecrate/supply/medicine/medkits{ + layer = 3.1; + pixel_x = 8; + pixel_y = 24 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/hangar) "Ms" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -10124,6 +9949,21 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"Mu" = ( +/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{ + name = "\improper Tripoli" + }, +/obj/item/tool/screwdriver{ + icon_state = "screwdriver5"; + layer = 3.03; + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/trash/eat{ + pixel_x = 10 + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) "Mv" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -10140,16 +9980,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"My" = ( -/obj/structure/closet/secure_closet/smartgunner{ - req_access_txt = "14;40"; - req_one_access = list(); - name = "squad two smartgunner locker" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/platoonprep) "MB" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -10193,16 +10023,43 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) +"MH" = ( +/obj/structure/surface/table/almayer, +/obj/structure/largecrate/random/mini/small_case/c{ + pixel_x = -15; + pixel_y = 9 + }, +/obj/item/clothing/mask/cigarette/cigar/tarbacks{ + pixel_x = -13; + pixel_y = 10 + }, +/obj/item/storage/fancy/cigar/matchbook/brown{ + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "MJ" = ( /obj/structure/shuttle/part/dropship1/transparent/lower_left_wing{ name = "\improper Tripoli" }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"MK" = ( -/obj/structure/machinery/landinglight/ds1, -/turf/open/floor/almayer{ - icon_state = "plate" +"ML" = ( +/obj/item/prop/almayer/comp_open{ + pixel_x = 40; + pixel_y = 4 + }, +/obj/structure/prop{ + color = "#b30000"; + icon = 'icons/obj/pipes/power_cond_white.dmi'; + icon_state = "4-5"; + layer = 2.8; + name = "cable"; + pixel_x = 5; + pixel_y = 2 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin14" }, /area/golden_arrow/hangar) "MM" = ( @@ -10212,6 +10069,20 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"MN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "apcbayrailing2" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "black" + }, +/area/golden_arrow/hangar) "MQ" = ( /obj/structure/bed/chair, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -10242,6 +10113,15 @@ /obj/structure/janitorialcart, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"MU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "MV" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -10263,37 +10143,19 @@ /turf/open/floor/almayer, /area/golden_arrow/hangar) "MY" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - dir = 4 - }, +/obj/structure/machinery/cm_vending/gear/medic_chemical, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, -/area/golden_arrow/medical) -"MZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoon_commander_rooms) -"Na" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/soap{ - pixel_y = -5; - pixel_x = -5 - }, -/obj/item/tool/soap{ - pixel_y = 12; - pixel_x = 7 - }, -/obj/item/tool/soap/nanotrasen{ - pixel_y = 6; - pixel_x = -7 +/area/golden_arrow/medical) +"MZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/almayer, -/area/golden_arrow/cryo_cells) +/area/golden_arrow/platoon_commander_rooms) "Nb" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable{ @@ -10323,61 +10185,10 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"Nj" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 23; - pixel_x = -5; - id = "weapons_conny"; - name = "weapons locker shutter control"; - req_one_access_txt = "19;12" - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 23; - pixel_x = 7; - id = "equipment_conny"; - name = "equipment locker shutter control"; - req_one_access_txt = "19;12" - }, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/platoonarmory) -"Nk" = ( -/obj/structure/machinery/camera/autoname/golden_arrow{ - dir = 4; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/storage{ - pixel_x = -18; - pixel_y = -7 - }, -/obj/structure/sign/safety/two{ - pixel_x = -18; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) -"Nn" = ( -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 28; - id = "apc1blastdoor"; - name = "vehicle bay blast door control" - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 28; - id = "apcbayrailing1"; - name = "vehicle bay railing control"; - pixel_x = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"Ni" = ( +/turf/open/floor/almayer/uscm{ + dir = 10; + icon_state = "logo_directional1" }, /area/golden_arrow/hangar) "No" = ( @@ -10400,6 +10211,22 @@ icon_state = "rasputin15" }, /area/golden_arrow/hangar) +"Ns" = ( +/obj/structure/bed/bedroll{ + buckle_lying = null; + can_buckle = 0; + color = "#333333"; + desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise."; + foldabletype = null; + name = "gym mat"; + pixel_x = -2; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/hangar) "Nt" = ( /obj/effect/decal/strata_decals/grime/grime1{ dir = 4 @@ -10411,6 +10238,34 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Nu" = ( +/obj/structure/closet/secure_closet{ + icon_broken = "fridgebroken"; + icon_closed = "fridge"; + icon_locked = "fridge1"; + icon_off = "fridge1"; + icon_opened = "fridgeopen"; + icon_state = "fridge1"; + name = "beverage fridge" + }, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + pixel_x = 8; + pixel_y = -7 + }, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + pixel_y = -1 + }, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + pixel_x = -2; + pixel_y = -4 + }, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + pixel_y = -9 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) "Nv" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -10438,6 +10293,24 @@ }, /turf/open/floor/almayer, /area/golden_arrow/briefing) +"Nz" = ( +/obj/structure/machinery/microwave{ + density = 0; + pixel_y = 9 + }, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 4; + pixel_y = 22 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/cryo_cells) "NA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -10499,13 +10372,6 @@ name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"NO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaythree, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "NQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -10534,30 +10400,20 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"NS" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/bible{ - desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; - name = "Holy Bible"; - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/flashlight/lamp/on{ - pixel_y = 14; - pixel_x = 5 +"NU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/ammunition{ + pixel_x = -18 }, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = 9; - pixel_y = 2 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "weapons_conny"; + name = "\improper Squad One Weapons Locker"; + pixel_y = -4 }, -/obj/item/trash/cigbutt{ - pixel_y = 10; - pixel_x = 1; - randpixel = 0 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, -/area/golden_arrow/shared_office) +/area/golden_arrow/platoonarmory) "NW" = ( /obj/structure/machinery/light{ dir = 1 @@ -10566,6 +10422,27 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"NX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail{ + dir = 4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -11; + pixel_y = 14 + }, +/obj/item/tool/hand_labeler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/spacecash/c10{ + layer = 2.7; + pixel_x = 11; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "NZ" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice1"; @@ -10627,6 +10504,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/prep_hallway) +"Oj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "Ol" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -10661,35 +10547,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"Op" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/bed/bedroll{ - pixel_y = -4; - color = "#333333"; - name = "gym mat"; - buckle_lying = null; - can_buckle = 0; - foldabletype = null; - desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise." - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) -"Or" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/megaphone{ - pixel_x = 11; - pixel_y = 7 - }, -/obj/item/prop/tableflag/uscm{ - pixel_y = -1; - pixel_x = -12 - }, -/turf/open/floor/almayer, -/area/golden_arrow/briefing) "Ot" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/cable/heavyduty{ @@ -10773,6 +10630,18 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/platoon_commander_rooms) +"OJ" = ( +/obj/structure/prop{ + can_buckle = 1; + desc = "It's a case made into an impromptu seat."; + icon = 'icons/obj/structures/crates.dmi'; + icon_state = "case"; + layer = 3.6; + name = "\improper seat-like case"; + pixel_y = -2 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "OK" = ( /obj/structure/disposalpipe/segment, /turf/open/space/basic, @@ -10831,15 +10700,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"OV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "OW" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -10859,6 +10719,43 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"OZ" = ( +/obj/structure/largecrate/supply/medicine/medkits{ + pixel_x = -11; + pixel_y = 9 + }, +/obj/structure/largecrate/supply/medicine/medkits{ + pixel_x = 14; + pixel_y = 9 + }, +/obj/structure/largecrate/supply/medicine/medkits{ + layer = 3.1; + pixel_x = 8; + pixel_y = 24 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/golden_arrow/hangar) +"Pc" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/dirty/torn{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/trash/cigbutt{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/trash/eat{ + pixel_x = 10 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) "Pd" = ( /turf/closed/shuttle/midway{ icon_state = "42"; @@ -10885,14 +10782,13 @@ icon_state = "test_floor5" }, /area/golden_arrow/medical) -"Pp" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/CICmap{ - pixel_y = 5; - pixel_x = -1; - layer = 4 +"Pl" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/golden_arrow/hangar) "Pr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -10907,6 +10803,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/dorms) +"Ps" = ( +/obj/structure/machinery/camera/autoname/golden_arrow{ + dir = 1 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = -26 + }, +/obj/structure/sign/safety/one{ + pixel_x = 14; + pixel_y = -26 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonarmory) "Pu" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -10914,42 +10823,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/shared_office) -"Py" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/item/tool/wet_sign{ - pixel_y = 14; - pixel_x = -14 - }, -/obj/item/tool/wet_sign{ - pixel_y = 10; - pixel_x = -17 - }, -/obj/item/tool/wet_sign{ - pixel_y = 6; - pixel_x = -13 - }, -/obj/item/tool/wet_sign{ - pixel_y = 2; - pixel_x = -15 - }, -/obj/item/tool/wet_sign{ - pixel_y = -2; - pixel_x = -13 - }, -/obj/item/tool/wet_sign{ - pixel_y = 16; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/golden_arrow/engineering) "PA" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -10975,6 +10848,14 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"PH" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/wy_chips_pepper{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "PI" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_y = -29 @@ -10989,6 +10870,38 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"PJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/storage{ + pixel_x = -18; + pixel_y = -7 + }, +/obj/structure/sign/safety/one{ + pixel_x = -18; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) +"PK" = ( +/obj/structure/bed/bedroll{ + buckle_lying = null; + can_buckle = 0; + color = "#006db0"; + desc = "A mechanic's mat."; + foldabletype = null; + name = "floor mat"; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/item/tool/weldingtool{ + pixel_y = 21 + }, +/obj/item/tool/wrench{ + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/golden_arrow/hangar) "PN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -11002,13 +10915,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"PO" = ( -/obj/structure/ladder{ - id = "engisouth"; - height = -1 - }, -/turf/open/floor/almayer, -/area/golden_arrow/engineering) "PP" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -11035,6 +10941,14 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/engineering) +"PV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/dam/crane/cargo{ + desc = "Standard cargo crane used by the USCM. Looks like this one has replacement parts for the Tripoli on it. You probably couldn't name half of these."; + dir = 4 + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) "PW" = ( /obj/structure/cargo_container/wy/right{ pixel_y = 5 @@ -11047,6 +10961,16 @@ dir = 10 }, /area/golden_arrow/supply) +"PY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "equipment_conny"; + name = "\improper Squad One Equipment Locker" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) "PZ" = ( /obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons{ name = "\improper Tripoli" @@ -11064,13 +10988,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) -"Qh" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_one_access_txt = "8;12;39;40"; - req_one_access = list() - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "Qi" = ( /obj/structure/platform{ dir = 4; @@ -11109,6 +11026,21 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) +"Qo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/medical/bruise_pack{ + pixel_x = -12; + pixel_y = 7 + }, +/obj/item/stack/medical/ointment{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "Qp" = ( /obj/structure/machinery/floodlight/landing/floor, /turf/open/floor/almayer{ @@ -11121,6 +11053,18 @@ icon_state = "mono" }, /area/golden_arrow/cryo_cells) +"Qs" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/almayer/comp_open{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "Qt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -11165,6 +11109,19 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"Qy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "apc2blastdoor"; + name = "\improper Vehicle Bay Two Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "Qz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/supply_drop/echo, @@ -11257,6 +11214,15 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"QM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "QN" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -11316,6 +11282,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/prep_hallway) +"QV" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access{ + density = 0; + pixel_y = 24 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/golden_arrow/medical) "QW" = ( /turf/open/floor/almayer, /area/golden_arrow/briefing) @@ -11330,18 +11305,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"QZ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Prep Lockers"; - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"Ra" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/dartboard{ + layer = 3.2; + pixel_y = 41 }, -/area/golden_arrow/platoonprep) +/obj/structure/bed/chair, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "Rb" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -11359,6 +11331,16 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) +"Rh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "equipment_conny"; + name = "\improper Squad Two Equipment Locker" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) "Ri" = ( /obj/structure/closet, /obj/item/maintenance_jack, @@ -11399,43 +11381,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"Rp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) -"Rt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, +"Ru" = ( /obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "apcbayrailing2" + id = "apcbayrailing1" }, /turf/open/floor/almayer{ - icon_state = "black"; - dir = 4 + dir = 1; + icon_state = "black" }, /area/golden_arrow/hangar) -"Rx" = ( -/obj/structure/largecrate/supply/motiondetectors, -/obj/item/ammo_box/magazine/mk1{ - layer = 3.1; - pixel_y = 14; - pixel_x = -12 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) "Rz" = ( /obj/structure/machinery/shower{ dir = 4 @@ -11492,6 +11446,38 @@ icon_state = "test_floor4" }, /area/golden_arrow/medical) +"RM" = ( +/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{ + name = "\improper Tripoli" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/cigbutt{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/trash/cigbutt{ + layer = 3.2; + pixel_x = 4; + pixel_y = 10 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = -1; + pixel_y = 17 + }, +/obj/item/trash/cigbutt{ + pixel_x = -7; + pixel_y = 10 + }, +/turf/open/floor/plating, +/area/golden_arrow/hangar) "RO" = ( /obj/structure/stairs/perspective, /obj/structure/platform{ @@ -11523,22 +11509,9 @@ /area/golden_arrow/medical) "RT" = ( /obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust{ - name = "\improper Tripoli" - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"RU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Vehicle Bay One Blast Door"; - id = "apc1blastdoor" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + name = "\improper Tripoli" }, +/turf/open/floor/plating, /area/golden_arrow/hangar) "RY" = ( /obj/structure/largecrate/random/secure, @@ -11570,6 +11543,15 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) +"Sc" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{ + locked = 1; + name = "\improper Tripoli cargo door" + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/golden_arrow/hangar) "Se" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -11589,33 +11571,19 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"Sg" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer, -/area/golden_arrow/synthcloset) "Si" = ( /turf/closed/shuttle/elevator{ dir = 5 }, /area/golden_arrow/supply) -"Sk" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood{ - req_access = list(); - pixel_y = 24; - density = 0 +"Sj" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "test_floor5" + icon_state = "plate" }, -/area/golden_arrow/medical) +/area/golden_arrow/hangar) "Sl" = ( /obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{ name = "\improper Tripoli" @@ -11644,28 +11612,15 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"Su" = ( -/obj/structure/sign/safety/ladder{ - pixel_y = 29 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/ladder{ - id = "enginorth"; - height = -1 +"Ss" = ( +/obj/structure/bed/chair{ + buckling_y = 10; + dir = 4; + pixel_y = 10 }, +/obj/structure/machinery/light, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"Sv" = ( -/obj/item/stack/sheet/metal, -/obj/item/stack/rods{ - pixel_y = 16; - pixel_x = -13 - }, -/obj/effect/decal/siding{ - icon_state = "siding8" - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) "Sw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -11725,45 +11680,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"SI" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad One Equipment Locker"; - id = "equipment_conny" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) -"SK" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/cigbutt/cigarbutt{ - pixel_y = 25; - pixel_x = -3; - randpixel = 0 - }, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/trash/cigbutt{ - pixel_y = 5; - pixel_x = 4; - randpixel = 0 - }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_y = 23; - pixel_x = 9; - layer = 3.3 - }, -/obj/item/storage/fancy/cigar/matchbook{ - pixel_y = 8; - pixel_x = -2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/platoonprep) "SL" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -11792,16 +11708,46 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"SP" = ( +"SO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad One Equipment Locker"; - id = "equipment_conny" +/obj/structure/surface/table/almayer, +/obj/structure/prop{ + density = 1; + desc = "A targeting system for dropships. It improves firing accuracy on laser targets. Far beyond repair."; + icon = 'icons/obj/structures/props/almayer_props.dmi'; + icon_state = "targeting_system"; + layer = 3.1; + name = "\improper Broken AN/AAQ-178 Weapon Targeting System"; + pixel_x = 7; + pixel_y = 3 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/item/prop/almayer/flight_recorder{ + pixel_x = -8; + pixel_y = 9 }, -/area/golden_arrow/platoonarmory) +/obj/item/reagent_container/food/drinks/coffee/marine{ + layer = 3.11; + pixel_x = 7; + pixel_y = 15 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) +"SQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/pipes/vents/pump, +/obj/item/trash/uscm_mre{ + pixel_x = 9; + pixel_y = 14 + }, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) "SR" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -11872,6 +11818,16 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/supply) +"SZ" = ( +/obj/structure/barricade/handrail, +/obj/structure/reagent_dispensers/fueltank{ + anchored = 1; + icon = 'icons/obj/structures/props/generic_props.dmi'; + icon_state = "weldtank_old"; + layer = 2.9 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "Ta" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -11928,22 +11884,29 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"Th" = ( -/turf/open/floor/almayer/uscm{ - icon_state = "logo_directional1"; - dir = 10 +"Tk" = ( +/obj/structure/machinery/prop{ + density = 1; + desc = "A pump used for refueling the dropship."; + icon_state = "pipe_d"; + layer = 2.7; + name = "refueling pump"; + pixel_y = -5 }, +/turf/open/floor/almayer, /area/golden_arrow/hangar) -"Tl" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/fire{ - pixel_y = 8; - pixel_x = 6 +"Tm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/effect/decal/cleanable/cobweb2/dynamic, -/obj/item/storage/firstaid/regular, /turf/open/floor/almayer, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar) "Tp" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ dir = 8 @@ -11972,14 +11935,26 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"Tu" = ( +"Ty" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/technology_scanner{ + pixel_x = 15 + }, /obj/effect/decal/cleanable/dirt, -/obj/item/trash/crushed_cup{ - pixel_y = -10; - pixel_x = 6 +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/reagent_container/food/drinks/dry_ramen{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/coffee/marine{ + pixel_x = -10; + pixel_y = 1 }, /turf/open/floor/almayer, -/area/golden_arrow/dorms) +/area/golden_arrow/engineering) "TB" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -11990,46 +11965,20 @@ "TD" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/platoon_commander_rooms) -"TE" = ( -/obj/item/stack/catwalk{ - pixel_x = 4 - }, -/obj/item/stack/catwalk{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) -"TG" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger{ - pixel_y = -10; - pixel_x = 5 - }, -/obj/item/smartgun_battery{ - pixel_x = 4; - pixel_y = -5 - }, -/obj/item/prop/magazine{ - icon_state = "poster8"; - name = "Soldier Of Fortune: Issue March 2182"; - desc = "A copy of Soldier of Fortune magazine. On the cover is a stylized imagine of a motion tracker in use, with the headline 'Combat Awareness in the 22nd Century'. The article covers the advancement in sensor technology that has made combat between peer nations like the UA and UPP increasingly lethal to those on the ground. Flipping through the magazine you see article titles such as 'Arsenal: The M2C Heavy Machinegun', and 'The Future War: advancements in Cyberdyne Systems combat AI'. At the back of the magazine is an extensive list of advertisements for private contractors and wares."; - pixel_y = 15; - pixel_x = 7 +"TF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/item/clipboard{ - pixel_x = -7; - pixel_y = 8 +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/platoonprep) +/area/golden_arrow/engineering) "TI" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -12090,23 +12039,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) -"TR" = ( -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 28; - id = "apc2blastdoor"; - name = "vehicle bay blast door control" - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 28; - id = "apcbayrailing2"; - name = "vehicle bay railing control"; - pixel_x = 13 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "TU" = ( /obj/structure/machinery/light{ dir = 8 @@ -12137,6 +12069,32 @@ }, /turf/open/floor/almayer, /area/golden_arrow/briefing) +"TZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/cigarettes/lucky_strikes_4{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/storage/fancy/cigar/matchbook{ + pixel_x = -1; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/platoonprep) +"Ua" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "weapons_conny"; + name = "\improper Squad Two Weapons Locker"; + pixel_y = -4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/platoonarmory) "Uc" = ( /obj/structure/bed/chair/comfy{ buckling_y = 2; @@ -12152,47 +12110,42 @@ id = "squadarmory"; name = "\improper Gear Lockers" }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonprep) -"Ui" = ( -/obj/structure/surface/table/almayer, -/obj/structure/largecrate/random/mini/small_case/c{ - pixel_x = -15; - pixel_y = 9 - }, -/obj/item/clothing/mask/cigarette/cigar/tarbacks{ - pixel_y = 10; - pixel_x = -13 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/obj/item/storage/fancy/cigar/matchbook/brown{ - pixel_y = 2 +/area/golden_arrow/platoonprep) +"Ug" = ( +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) -"Ul" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/largecrate/random/case{ - pixel_y = 5 + icon_state = "SW-out" }, -/obj/structure/largecrate/random/case/double{ - pixel_y = 15 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blackcorner" }, -/obj/structure/largecrate/random/case{ - pixel_y = -5 +/area/golden_arrow/hangar) +"Uj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delaythree, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/largecrate/random/mini/small_case{ - pixel_x = 8; - layer = 3.1; - pixel_y = 14 +/area/golden_arrow/hangar) +"Uk" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "apc2blastdoor"; + name = "vehicle bay blast door control"; + pixel_y = 28 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/machinery/door_control/brbutton{ + id = "apcbayrailing2"; + name = "vehicle bay railing control"; + pixel_x = 13; + pixel_y = 28 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -12219,6 +12172,17 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"Up" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ + req_access = list(); + req_one_access_txt = "8;12;39;40" + }, +/obj/item/reagent_container/food/drinks/cans/souto/lime{ + pixel_x = 10; + pixel_y = 21 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "Ur" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -12240,6 +12204,17 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/prep_hallway) +"Ut" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "apcbayrailing2" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "black" + }, +/area/golden_arrow/hangar) "Uu" = ( /obj/structure/machinery/gear{ id = "supply_elevator_gear" @@ -12268,25 +12243,44 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) -"UB" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical/green{ - pixel_y = 6 +"Uz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/golden_arrow/hangar) -"UE" = ( -/obj/structure/largecrate/supply/medicine/medkits{ - pixel_y = 24; - pixel_x = 8; - layer = 3.1 +"UA" = ( +/obj/structure/cargo_container/wy/left{ + opacity = 0; + pixel_y = -17 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/toy/plush/therapy/red{ + desc = "An unapproved bootleg copy of the patented Sergeant Huggs. Looks like he's seen better days."; + force = 15; + layer = 4.1; + name = "Discharged Huggs"; + pixel_x = 5; + pixel_y = 32; + throwforce = 15 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "plate" + }, +/area/golden_arrow/hangar) +"UB" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, /area/golden_arrow/hangar) "UF" = ( @@ -12297,17 +12291,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"UG" = ( -/obj/structure/largecrate/supply/ammo{ - name = "sentry crate"; - fill_from_loc = 1 - }, -/obj/item/ammo_magazine/sentry{ - layer = 3.01 - }, -/obj/item/defenses/handheld/sentry, -/turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) "UH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -12326,14 +12309,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) -"UJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/almayer/comp_open{ - pixel_y = 9; - pixel_x = -6 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "UK" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4 @@ -12362,6 +12337,26 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"UU" = ( +/obj/structure/closet/secure_closet/marine_personal{ + job = "Smartgunner"; + pixel_x = -7 + }, +/obj/structure/closet/secure_closet/marine_personal{ + job = "Squad Sergeant"; + pixel_x = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/cryo_cells) +"UW" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_x = 2; + pixel_y = -6 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "UY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -12397,36 +12392,6 @@ icon_state = "cargo" }, /area/golden_arrow/cryo_cells) -"Vb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/largecrate/supply/ammo{ - pixel_y = 11; - name = "smoke grenades case"; - fill_from_loc = 1 - }, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/hangar) "Vd" = ( /obj/structure/platform{ dir = 8; @@ -12446,29 +12411,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"Vg" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/largecrate/random/case/small{ - pixel_y = 14; - anchored = 1; - density = 0 - }, -/obj/structure/prop{ - layer = 2.1; - icon = 'icons/obj/items/items.dmi'; - icon_state = "sheet-wood"; - name = "wooden rack"; - desc = "A wooden rack fitted to the wall."; - pixel_y = 35 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) "Vh" = ( /obj/structure/machinery/light{ dir = 4 @@ -12490,25 +12432,15 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"Vm" = ( -/obj/structure/bed/bedroll{ - pixel_y = -4; - color = "#006db0"; - name = "floor mat"; - buckle_lying = null; - can_buckle = 0; - foldabletype = null; - desc = "A mechanic's mat." - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/item/tool/weldingtool{ - pixel_y = 21 - }, -/obj/item/tool/wrench{ - pixel_y = 7 +"Vn" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ + layer = 3.1; + name = "Midway Remote Control Console"; + pixel_y = 6; + shuttleId = "dropship_midway" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/almayer, /area/golden_arrow/hangar) "Vo" = ( /obj/effect/decal/warning_stripes{ @@ -12526,6 +12458,59 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Vs" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/item/tool/hand_labeler{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/item/device/flashlight/flare{ + pixel_x = 19; + pixel_y = -1 + }, +/obj/structure/machinery/door_control/brbutton{ + id = "squadarmory"; + name = "gear locker shutter control"; + pixel_y = 28; + req_one_access_txt = "19;12" + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) +"Vu" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/bible{ + desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; + name = "Holy Bible"; + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/device/flashlight/lamp/on{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/trash/cigbutt{ + pixel_x = 1; + pixel_y = 10; + randpixel = 0 + }, +/turf/open/floor/almayer, +/area/golden_arrow/shared_office) +"Vv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -7; + pixel_y = 15 + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "Vw" = ( /obj/structure/shuttle/part/dropship1/transparent/nose_top_right{ name = "\improper Tripoli" @@ -12541,65 +12526,38 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"VA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/item/tool/hand_labeler{ - pixel_y = 13; - pixel_x = 1 - }, -/obj/item/device/flashlight/flare{ - pixel_x = 19; - pixel_y = -1 +"Vz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/landinglight/ds1{ + dir = 1 }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 28; - id = "squadarmory"; - name = "gear locker shutter control"; - req_one_access_txt = "19;12" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonprep) +/area/golden_arrow/hangar) "VB" = ( /turf/closed/shuttle/elevator/freight, /area/golden_arrow/supply) -"VC" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - name = "\improper Squad Two Weapons Locker"; - id = "weapons_conny"; - pixel_y = -4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "VD" = ( /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"VI" = ( -/obj/structure/machinery/door_control{ - id = "cargolock"; - name = "GM cargo lock control"; - pixel_y = 11; - pixel_x = -7 +"VE" = ( +/obj/structure/machinery/floodlight/landing/floor, +/obj/structure/machinery/landinglight/ds1, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/machinery/door_control{ - id = "bay1door"; - name = "GM north weapon bay control"; - pixel_y = 11; - pixel_x = 8 +/area/golden_arrow/hangar) +"VH" = ( +/obj/structure/closet/secure_closet/smartgunner{ + name = "squad two smartgunner locker"; + req_access_txt = "14;40"; + req_one_access = list() }, -/obj/structure/machinery/door_control{ - id = "bay2door"; - name = "GM south weapon bay control"; - pixel_y = 1; - pixel_x = 8 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating, -/area/golden_arrow/supply) +/area/golden_arrow/platoonprep) "VK" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -12621,23 +12579,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) -"VP" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/almayer/comp_closed{ - pixel_x = -14; - pixel_y = 13 - }, -/obj/item/reagent_container/food/drinks/coffee/marine, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 16; - pixel_x = -13 - }, -/obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_x = 9; - pixel_y = 9 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "VS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -12648,19 +12589,6 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) -"VU" = ( -/obj/structure/closet/secure_closet/marine_personal{ - pixel_x = -7; - job = "Platoon Sergeant" - }, -/obj/structure/closet/secure_closet/marine_personal{ - pixel_x = 8; - job = "Platoon Corpsman" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/cryo_cells) "VV" = ( /obj/structure/sign/safety/storage{ pixel_x = 9; @@ -12675,17 +12603,6 @@ "Wa" = ( /turf/open/floor/almayer, /area/golden_arrow/hangar) -"Wc" = ( -/obj/item/tool/screwdriver{ - pixel_y = 7; - pixel_x = -4; - layer = 3.03; - icon_state = "screwdriver3" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/golden_arrow/hangar) "Wd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -12731,23 +12648,6 @@ "Wh" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/cryo_cells) -"Wj" = ( -/obj/structure/fence, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - name = "First Platoon Ready Bay Blast Door"; - closed_layer = 3.3; - layer = 3.3; - open_layer = 3.3; - id = "squadblastdoor" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/platoonarmory) "Wk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -12760,6 +12660,14 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/platoonprep) +"Wm" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "Wn" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/light{ @@ -12775,6 +12683,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"Wq" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/item/prop{ + desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines."; + icon = 'icons/obj/items/paper.dmi'; + icon_state = "newspaper"; + name = "The Marine Corps Gazette"; + pixel_x = -1; + pixel_y = -2 + }, +/turf/open/floor/almayer, +/area/golden_arrow/cryo_cells) "Wr" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -12931,37 +12855,36 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"WM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 28; - id = "squadblastdoor"; - name = "hangar blast door control"; - req_one_access_txt = "19;12" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "cargo_arrow" - }, -/area/golden_arrow/platoonarmory) "WO" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"WP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +"WR" = ( +/obj/structure/toilet{ + dir = 1 }, -/obj/structure/machinery/door/poddoor/almayer{ +/obj/structure/barricade/metal{ + dir = 8; + pixel_x = -1 + }, +/obj/structure/barricade/metal{ dir = 4; - name = "\improper Vehicle Bay Two Blast Door"; - id = "apc2blastdoor" + pixel_x = 1 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/barricade/metal{ + dir = 8; + pixel_x = -1; + pixel_y = 8 }, -/area/golden_arrow/hangar) +/obj/structure/barricade/metal{ + dir = 4; + pixel_x = 1; + pixel_y = 8 + }, +/obj/structure/curtain/red, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/cryo_cells) "WT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -12982,20 +12905,19 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"WX" = ( +"WY" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 1; - pixel_x = -1 +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, +/turf/open/floor/almayer, /area/golden_arrow/hangar) "Xb" = ( /obj/effect/decal/cleanable/dirt, @@ -13006,17 +12928,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/golden_arrow/platoonprep) -"Xc" = ( -/obj/structure/prop{ - name = "\improper uncomfy case"; - desc = "A regular case you'd sit on. The label says it's full of steel sheets. Probably empty now."; - icon_state = "case"; - icon = 'icons/obj/structures/crates.dmi'; - can_buckle = 1; - layer = 3.6 - }, -/turf/open/floor/almayer, -/area/golden_arrow/hangar) "Xd" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -13130,6 +13041,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"Xw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "Xx" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13147,6 +13071,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/briefing) +"XC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/prop/dam/crane, +/obj/structure/prop{ + density = 1; + desc = "A cooling system for the Tripoli. It produces additional cooling reducing delays between launch. The pipes are crooked and bent, hoses are sliced open, and that's not even mentioning the bullet holes. Looks to be an older model as well."; + icon = 'icons/obj/structures/props/almayer_props64.dmi'; + icon_state = "cooling_system"; + layer = 3.1; + name = "Damaged FS/ACS-9 cooling system"; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "XD" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -13170,6 +13110,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/platoonprep) +"XF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + closed_layer = 3.3; + dir = 4; + layer = 3.3; + name = "Maintenance Bay Blast Door"; + open_layer = 3.3 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "XI" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -13229,6 +13185,21 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"XQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/golden_arrow/medical) "XR" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -13263,16 +13234,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) -"XW" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 8 - }, -/area/golden_arrow/hangar) "XZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -13282,23 +13243,30 @@ icon_state = "rasputin3" }, /area/golden_arrow/hangar) -"Yb" = ( -/obj/structure/largecrate/supply/ammo{ - name = "sentry crate"; - fill_from_loc = 1 - }, -/obj/item/ammo_magazine/sentry{ - layer = 3.01 - }, -/obj/item/defenses/handheld/sentry, -/obj/structure/largecrate/supply/explosives/grenades/less{ +"Ya" = ( +/obj/structure/prop{ + can_buckle = 1; + desc = "A rather cozy case you can sit on. The label says it's full of pillows - though it's probably empty."; + icon = 'icons/obj/structures/crates.dmi'; icon_state = "case"; - pixel_y = 10; - pixel_x = 20; - layer = 3.1 + name = "\improper cozy case"; + pixel_y = 6 }, /turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) +/area/golden_arrow/hangar) +"Yc" = ( +/obj/structure/closet/secure_closet, +/obj/structure/machinery/prop{ + desc = "This stylized recruitment poster for the USCM depicts a the head of a screaming eagle breaking into orbit, surrounded by flames. Death from above."; + icon = 'icons/obj/structures/props/posters.dmi'; + icon_state = "poster41"; + layer = 3.5; + name = "USCM recruitment poster"; + pixel_x = -1; + pixel_y = 34 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoon_commander_rooms) "Ye" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -13420,6 +13388,36 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"YD" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + density = 0; + pixel_y = 24; + req_access = list() + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/golden_arrow/medical) +"YF" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/phone_base{ + name = "overwatch receiver"; + phone_id = "Overwatch"; + pixel_x = 9; + pixel_y = 30 + }, +/obj/structure/machinery/computer/ares_console{ + dir = 4; + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -5; + pixel_y = -11 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoon_commander_rooms) "YH" = ( /obj/structure/machinery/shower{ dir = 8 @@ -13440,12 +13438,24 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/golden_arrow/shared_office) +"YL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stool{ + pixel_x = 1; + pixel_y = 20 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoonprep) "YM" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "apcbayrailing2" }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "black" }, /area/golden_arrow/hangar) "YP" = ( @@ -13460,24 +13470,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/hangar) -"YR" = ( -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/structure/surface/table/almayer, -/obj/item/prop/magazine/dirty/torn{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/trash/cigbutt{ - pixel_y = 10; - pixel_x = -7 - }, -/obj/item/trash/eat{ - pixel_x = 10 - }, -/turf/open/floor/almayer, -/area/golden_arrow/dorms) "YS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -13551,16 +13543,35 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/shared_office) -"Zb" = ( -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - name = "\improper Weapons Bay One Blast Door"; - id = "bay1door" +"Zc" = ( +/obj/structure/bed/bedroll{ + layer = 3.1; + pixel_x = 3; + pixel_y = -8 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/item/clothing/head/cmcap{ + layer = 4.2; + pixel_x = 4; + pixel_y = 6 }, +/turf/closed/wall/almayer/outer, /area/golden_arrow/hangar) +"Zd" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/almayer/chaff_launcher{ + pixel_x = 3; + pixel_y = 9 + }, +/obj/item/prop/almayer/flare_launcher{ + pixel_x = 5; + pixel_y = 19 + }, +/obj/item/prop/almayer/handheld1{ + pixel_x = 6; + pixel_y = -8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/engineering) "Ze" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -13570,18 +13581,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) -"Zf" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Dorms"; - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/dorms) "Zg" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -13643,6 +13642,16 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/hangar) +"Zn" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "apc1blastdoor"; + name = "\improper Vehicle Bay One Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/hangar) "Zo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -13660,6 +13669,13 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"Zq" = ( +/obj/structure/ladder{ + height = -1; + id = "engisouth" + }, +/turf/open/floor/almayer, +/area/golden_arrow/engineering) "Zs" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -13677,23 +13693,24 @@ icon_state = "test_floor4" }, /area/golden_arrow/prep_hallway) +"Zu" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/straight_razor{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/clothing/head/cmcap/bridge{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/golden_arrow/platoon_commander_rooms) "Zv" = ( /turf/closed/shuttle/midway{ icon_state = "64"; name = "\improper Tripoli" }, /area/golden_arrow/hangar) -"Zx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 8 - }, -/area/golden_arrow/hangar) "Zz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -13712,25 +13729,6 @@ icon_state = "test_floor4" }, /area/golden_arrow/hangar) -"ZB" = ( -/obj/structure/largecrate/random/case/double{ - pixel_y = 5; - pixel_x = 4 - }, -/obj/structure/largecrate/random/case/double{ - pixel_y = -7; - pixel_x = 6; - layer = 3.1 - }, -/obj/structure/largecrate/random/mini/small_case{ - pixel_x = 14; - layer = 3.1; - pixel_y = 24 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/golden_arrow/hangar) "ZE" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -13769,35 +13767,14 @@ icon_state = "plate" }, /area/golden_arrow/briefing) -"ZK" = ( -/obj/structure/largecrate/supply/motiondetectors, -/obj/structure/largecrate/supply/explosives/grenades/less{ - icon_state = "case"; - pixel_y = 10 - }, -/obj/item/ammo_box/magazine/mk1{ - layer = 3.1; - pixel_y = 14; - pixel_x = -2 - }, -/turf/open/floor/almayer, -/area/golden_arrow/platoonarmory) -"ZM" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/plate{ - pixel_y = 8; - pixel_x = 7 - }, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -4; - pixel_y = 13 +"ZL" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 }, -/obj/item/reagent_container/food/snacks/protein_pack{ - pixel_y = 9; - pixel_x = 3 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/golden_arrow/cryo_cells) +/area/golden_arrow/hangar) "ZN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13814,6 +13791,19 @@ }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"ZS" = ( +/obj/structure/machinery/gear{ + id = "supply_elevator_gear" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blackcorner" + }, +/area/golden_arrow/hangar) "ZT" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/cable/heavyduty{ @@ -13832,39 +13822,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/golden_arrow/hangar) -"ZV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing2" - }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 - }, -/area/golden_arrow/hangar) -"ZW" = ( -/obj/item/stack/cable_coil{ - pixel_y = 13; - pixel_x = 7 - }, -/obj/effect/decal/siding{ - icon_state = "siding8" - }, -/turf/open/floor/plating, -/area/golden_arrow/hangar) -"ZY" = ( +"ZX" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/door/poddoor/railing{ - id = "apcbayrailing1" +/obj/structure/machinery/vending/walkman{ + density = 0; + pixel_x = 10; + pixel_y = 21 }, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 1 +/obj/item/trash/kepler{ + pixel_x = 8; + pixel_y = 44 }, -/area/golden_arrow/hangar) +/obj/item/trash/barcardine, +/turf/open/floor/almayer, +/area/golden_arrow/dorms) (1,1,1) = {" EG @@ -18338,24 +18309,24 @@ eI cb cb eI -Rp +sv eI cb cb xp -ty +BS dA mp Wg jU Wg fh -pi +kB Wg Wg jU Wg -qI +pc Wh EG EG @@ -18649,13 +18620,13 @@ kw yQ aN bx -an +ZX We bx We GM bx -iu +LC RY bx vb @@ -18802,9 +18773,9 @@ Yw aN bx oo -CA +mk gg -YR +Pc hn Qu Xy @@ -18953,15 +18924,15 @@ br jw og bx -eL +SQ hQ aJ SE pg PS zX -vO -bi +Do +uj vb EG EG @@ -19093,7 +19064,7 @@ EG EG EG Wh -kD +UU aN bm aN @@ -19103,7 +19074,7 @@ oU aN bm QH -kD +UU bx vf Xy @@ -19401,9 +19372,9 @@ Fo NA YS Bk -VU +Gw og -VU +Gw NA YS NA @@ -19511,9 +19482,9 @@ IC IC IC IC -Su +ua Yo -PO +Zq IC IC IC @@ -19661,12 +19632,12 @@ EG EG IC bd -uJ +Vv Uw uq Oc bb -hT +SZ qr JF IC @@ -19701,7 +19672,7 @@ Wh Wh Wh Wh -nu +pE QH fa Xm @@ -19711,7 +19682,7 @@ oU Xm fa aN -nu +pE bx Ln KE @@ -19720,7 +19691,7 @@ lB We bx ET -Tu +wh UQ vb EG @@ -19850,7 +19821,7 @@ EG EG EG Wh -so +Dn gF og og @@ -19868,7 +19839,7 @@ bx bx bx UZ -Zf +oe bx bx bx @@ -19964,15 +19935,15 @@ EG EG EG IC -Hn +av PR Gs Ys Ys Ys -gX +TF PR -dW +Ss IC EG EG @@ -20002,7 +19973,7 @@ EG EG EG Wh -en +Mm Ou Kz VN @@ -20116,14 +20087,14 @@ EG EG EG IC -fR +pK yW em yS yS yS fx -xf +rb Zi IC EG @@ -20156,7 +20127,7 @@ EG Wh eF Qw -xU +WR og og ie @@ -20268,8 +20239,8 @@ IC IC IC IC -Tl -BU +GL +Qs OP yS yS @@ -20308,20 +20279,20 @@ EG Wh fI HF -xU +WR og rr Ze Np -nw -gS +Wq +Ax DI As Em dZ -Na +cd FZ -qu +cn og jg Cm @@ -20418,10 +20389,10 @@ EG IC jn Bl -eR +uX DA DA -pD +lU ui Ts rS @@ -20429,7 +20400,7 @@ Ts lR PR pr -hp +Ty IC EG EG @@ -20460,14 +20431,14 @@ EG Wh fI HF -xU +WR og rr jW Bk DI DI -ZM +iI hS bm Bk @@ -20478,11 +20449,11 @@ og OU kQ Hp -dj -ek -pV +fS +Hg MY CE +CE aI EG EG @@ -20568,11 +20539,11 @@ EG EG EG IC -Py +mD SL di di -ug +AM Zo LQ oP @@ -20581,7 +20552,7 @@ CG Sp wj cc -Gi +pu IC EG EG @@ -20630,11 +20601,11 @@ og QP Cm Hp -fO -Eb +KW iQ kT Lg +CE aI EG EG @@ -20728,12 +20699,12 @@ DA po jP Lc -yZ -ez -tD +Zd +uy +tO yW Wv -dg +in IC EG EG @@ -20784,9 +20755,9 @@ EL CE En HM -KW FA -bK +FD +CE aI EG EG @@ -20918,7 +20889,7 @@ EG EG EG Wh -dL +Nu bm NA mO @@ -21026,7 +20997,7 @@ EG IC ke mc -uP +Lh tX IC Yv @@ -21074,7 +21045,7 @@ HH pB HK tB -zV +gU gp Nb uK @@ -21086,7 +21057,7 @@ rY QS Cm Hp -Av +Gj jt tJ kW @@ -21226,7 +21197,7 @@ rr Bk Bk Kk -eg +Hy Da Bk Bk @@ -21238,7 +21209,7 @@ EL DD EL Hp -gc +aC jt hP nM @@ -21335,9 +21306,9 @@ EG Yv Yv XI -Sg +Fw aY -sL +DV mj Jd IC @@ -21378,7 +21349,7 @@ rr Bk NA mO -tW +gW Qm Bk Bk @@ -21393,9 +21364,9 @@ Xh IZ NK Zp -Le +XQ KS -lA +tu aI EG EG @@ -21488,7 +21459,7 @@ Yv xZ Cy gr -BL +oY IC fb ak @@ -21545,7 +21516,7 @@ HR fX Iw NH -KN +BF wf zP aI @@ -21694,7 +21665,7 @@ EL CE CE CE -vE +QV hJ KW Eh @@ -21833,7 +21804,7 @@ Wh Wh Wh Wh -lW +zB Yn py og @@ -21849,7 +21820,7 @@ XN Pj yr NI -xd +Qo ns RI aI @@ -21945,7 +21916,7 @@ IC IC rF pr -np +pq pr Kn IC @@ -21984,7 +21955,7 @@ EG EG EG Wh -Ev +Nz HF rQ HF @@ -21998,7 +21969,7 @@ rk CE nb CE -Sk +YD Qv Ah pb @@ -22140,7 +22111,7 @@ fl HF rQ HF -qT +AV og og Va @@ -22247,7 +22218,7 @@ EG EG IC Mf -JZ +Jy wF IC wV @@ -22292,10 +22263,10 @@ zG aA vN nW -li +nD og og -xx +Dq Ms Iz Qx @@ -22587,11 +22558,11 @@ EG EG EG DQ -FT -My +lJ +VH Ir -Aj -zI +sA +ab Ir qW IM @@ -22603,7 +22574,7 @@ og Cm Iz bF -fL +uR EK SY mY @@ -22890,18 +22861,18 @@ EG EG EG DQ -uc +Mk rI rI -Nk +tr VK Yr -aM +PJ rI rI rI Yr -Fb +AN Yr Ir ra @@ -23042,7 +23013,7 @@ zs zs zs oj -Vg +jf bc KC yR @@ -23196,7 +23167,7 @@ Sz YY qx Tb -dr +Gy Ir JE JE @@ -23204,7 +23175,7 @@ JE JE JE Ir -VA +Vs bI iJ FY @@ -23337,24 +23308,24 @@ EG EG EG zs -bS +uZ QW -Or +oH TW lq kI DB Ta -me +tp Zg Td -mW +wU Ir -Er -Qh -fo -Qh -fo +Up +Cb +wE +Cb +wE Ir tP HT @@ -23496,11 +23467,11 @@ Mh kh La ZJ -Ib +sT YY mH bI -wL +NX Ir JE JE @@ -23508,7 +23479,7 @@ JE JE JE Ir -yO +dc ww iJ il @@ -23666,7 +23637,7 @@ QX FY er FN -IG +pL eW Ay eW @@ -23674,7 +23645,7 @@ Ov mz eW TD -VI +pf hl EG EG @@ -23809,7 +23780,7 @@ rI FM Yr Yr -gV +YL RH Wf Yr @@ -23822,7 +23793,7 @@ fp eW eW eW -xu +fw Xx pR TD @@ -23956,16 +23927,16 @@ YY YY VZ RD -QZ +kS VZ Ir -qP -SK -TG -HJ +Ej +cK +Aq +TZ do YK -jB +ai YK eW Yi @@ -23975,11 +23946,11 @@ tl JI iW AZ -gT +DK rV eW -Ki -hB +Yc +Zu TD EG EG @@ -24109,7 +24080,7 @@ da wQ Ye OB -bf +Ps bk bk do @@ -24120,7 +24091,7 @@ Lx Bh Fg eW -cX +YF lY ZN uk @@ -24255,14 +24226,14 @@ EG EG EG HZ -Im -km +oK +NU pI Ot Ck Ot Ba -SI +qE JR do NQ @@ -24270,7 +24241,7 @@ ZE AQ nP nS -yN +ip eW nj uk @@ -24282,8 +24253,8 @@ pU QA QK eW -Hh -kg +uF +xi TD EG EG @@ -24408,24 +24379,24 @@ EG EG HZ CX -nJ +gQ qk Cv au Cv qk -SP -ZK +PY +iF do -NS +Vu Jk pl wJ Pu YZ eW -LY -Ew +vP +dX cj dz dz @@ -24560,14 +24531,14 @@ EG EG HZ CX -nJ +gQ HY wQ ga wQ Yg -eX -UG +Gd +HE do rP rP @@ -24713,7 +24684,7 @@ EG HZ bk gn -Nj +et wQ ga wQ @@ -24721,14 +24692,14 @@ Um gn bk kb -gh -LS +Zc +UA JL cZ vx -wp +yF yb -Vb +jz dz AY dz @@ -24752,7 +24723,7 @@ QB dz AY dz -iY +fE jC cZ VD @@ -24864,17 +24835,17 @@ EG EG HZ zk -VC +Ua QJ Cv ga wQ oI -ha -Yb +Dc +bZ kb -ju -El +cy +wm Bg bC jY @@ -24904,8 +24875,8 @@ pz dz AY dz -Hj -UE +OZ +Mr BQ VD tK @@ -25016,17 +24987,17 @@ EG EG HZ CX -jA +jh qk wQ MG Cv qk -ha -Rx +Dc +ja kb dz -rX +IL Ha XO kG @@ -25037,21 +25008,21 @@ dz AY dz jM -qz +cG VD -CW +wi VD -qz +cG jI dz AY dz xV -qz +cG jY -qz +cG VD -qz +cG OD dz AY @@ -25167,20 +25138,20 @@ EG EG EG HZ -Im -hh +oK +pd Jx Ot aP Ot mI -rG +Rh JM kb -qZ -Hl +im +zt Au -jr +gw LX Lu tb @@ -25189,26 +25160,26 @@ dz AY dz za -qz +cG VD -kH +jQ jY -qz +cG cR dz AY dz za -qz +cG jY -CW +wi Xe -CW +wi tt dz AY dz -ZB +Df Bg Ij RG @@ -25325,13 +25296,13 @@ Ia ur rl IX -qN +gK fZ bk kb dz -nf -on +Db +sa xA Gg WU @@ -25360,8 +25331,8 @@ YT dz AY dz -Ul -iP +cp +CN FS sz Ur @@ -25473,7 +25444,7 @@ EG EG EG HZ -WM +cF vs sI vs @@ -25625,11 +25596,11 @@ EG EG EG HZ -Wj -Wj -Ji -Wj -Wj +sQ +sQ +Lt +sQ +sQ bk TJ LD @@ -25645,21 +25616,21 @@ AY AY AY dz -Zb -Zb -jO -Zb -Zb +kX +kX +hO +kX +kX dz -uQ +sp jj ud dz -Et -Et -ov -Et -Et +vk +vk +mt +vk +vk dz AY AY @@ -25783,9 +25754,9 @@ Uo fM PI kb -nU -bh -nU +nT +XF +nT dz jH ey @@ -26090,7 +26061,7 @@ AL bq QN bq -qG +WY DM cE Ws @@ -26110,13 +26081,13 @@ os QB Cp zL -hF +qh sY sY bg Xd Xd -AX +Oj QY Wa Wa @@ -26126,7 +26097,7 @@ Xd bg sY sY -hI +SM Wa Wa cE @@ -26135,7 +26106,7 @@ hC Xd bg sY -hI +SM lu lu dz @@ -26229,7 +26200,7 @@ dz tT cE pN -ux +OJ cE Wa Ff @@ -26238,9 +26209,9 @@ os hy OL lu -by +fY VD -jG +hv VD Cn dS @@ -26381,17 +26352,17 @@ MR Wa aB Wa -Xc +sO cE Wa Ff cE os hy -JV +KO lu TK -uU +ys Xe VD xP @@ -26414,14 +26385,14 @@ td Mt Oa Xv -oV +Xw WT WT WT WT WT -yG -AG +bn +UW WB cE iw @@ -26430,7 +26401,7 @@ WT WT WT WT -yG +bn Wa Wa Wa @@ -26439,9 +26410,9 @@ iw WT WT WT -zJ +JO FE -tG +Ke UF zS Bg @@ -26532,7 +26503,7 @@ ZA MR cE va -wW +Ya Wa Wa Wa @@ -26581,8 +26552,8 @@ sY sY sY dp -vd -fn +SO +zm sY Km Xd @@ -26684,7 +26655,7 @@ ZA MR Wa Rj -jV +Ra Wa cE Wa @@ -26692,31 +26663,31 @@ ul OQ wC PA -Fw -CC -gw -rz -Fw -tc -gw -rz -oa -ru -YM -rz -Fw -tc -gw +GF +QM +Gn +jL +GF +hb +Gn +jL +sh +sn +Sj +jL +GF +hb +Gn PA -Fw -tc -YM +GF +hb +Sj PA SH cB Wa Wa -FX +oW Wa cE nH @@ -26842,7 +26813,7 @@ Wa Wa ul OQ -eT +yA yX yX yX @@ -26864,11 +26835,11 @@ yX yX yX yX -Fm +hc jN Wa Wa -Pp +LO Wa Wa os @@ -26883,8 +26854,8 @@ Sq Sq Sq Sq -ZW -Sv +cU +Mj Sq Sq Sq @@ -26994,7 +26965,7 @@ JW zD nY OQ -MK +Mi yX yX yX @@ -27016,18 +26987,18 @@ yX yX yX yX -nk +Dy jN cE -KG -jy +Tk +Vn Wa cE os cC RR yX -xC +PV yX Rc fF @@ -27035,8 +27006,8 @@ yX ml tn MJ -Vm -CV +PK +Mu hf Ie jx @@ -27049,7 +27020,7 @@ gu zz jp Ky -WX +CD xy zS Bg @@ -27146,7 +27117,7 @@ VD oR QC OQ -NO +Uj yX yX yX @@ -27172,7 +27143,7 @@ nx cB cE Wa -Ui +MH Wa Wa os @@ -27188,7 +27159,7 @@ dM QD WF qH -ef +RM CK KP KA @@ -27197,8 +27168,8 @@ ft hX Rc yX -vV -mG +kz +dh HP Md Ma @@ -27320,7 +27291,7 @@ yX yX yX yX -qU +dY sM jY bR @@ -27353,7 +27324,7 @@ Lm cC Zs FE -tG +Ke xy xa mf @@ -27450,7 +27421,7 @@ Wa cE Ff OQ -eT +yA yX yX yX @@ -27472,12 +27443,12 @@ yX yX yX yX -nL +Vz cB bR -Th +Ni xs -BP +IA bR nH lu @@ -27496,7 +27467,7 @@ sH XZ ly sH -mq +Sc Rc yX yX @@ -27602,7 +27573,7 @@ zF VM HA lE -AO +VE yX yX yX @@ -27624,12 +27595,12 @@ yX yX yX yX -Ld +lZ jN Qp -iX +io CI -Lz +zg Qp nH xz @@ -27640,8 +27611,8 @@ Dp Nq EP EQ -EM -In +kj +ML Aw mE sH @@ -27754,7 +27725,7 @@ Wa cE Ff OQ -Hc +ae yX yX yX @@ -27779,9 +27750,9 @@ yX nx jN bR -ev -GD -tM +Iq +nK +es bR os lu @@ -27792,8 +27763,8 @@ kl CQ JH Mn -Bx -px +cN +Ab oF He sH @@ -27928,7 +27899,7 @@ yX yX yX yX -Cj +ZL cB VD bR @@ -27944,7 +27915,7 @@ yX yX Pe FQ -Wc +BZ eP Vd mg @@ -27955,13 +27926,13 @@ FP YJ nR hu -pw +oJ yX Lm lu jp Ky -WX +CD tb xa mf @@ -28058,7 +28029,7 @@ jY xY nY OQ -sJ +lM yX yX yX @@ -28080,7 +28051,7 @@ yX yX yX yX -Fm +hc cB Wa Wa @@ -28210,7 +28181,7 @@ Xd sY hs OQ -xF +GV yX yX yX @@ -28232,11 +28203,11 @@ yX yX yX yX -Fm +hc cB Wa Wa -UJ +tg Wa Wa os @@ -28265,7 +28236,7 @@ gu lu Zs FE -aV +yt xy zS Bg @@ -28362,7 +28333,7 @@ aE QB MB OQ -Hc +ae yX yX yX @@ -28384,11 +28355,11 @@ yX yX yX yX -nk +Dy jN Wa Wa -VP +nh Wa cE os @@ -28508,7 +28479,7 @@ zS mf os yh -hZ +tC VD vG QB @@ -28516,31 +28487,31 @@ MB OQ Gz ir -vJ -hK -OV +Pl +MU +qM ir -lc -TE -OV +Ho +Cr +qM ir -vJ -oz -pZ -Dt -sU -Fd -pZ -Dt -vJ -Fd -pZ +Pl +wr +Wm +eu +Uz +AJ +Wm +eu +Pl +AJ +Wm ir lh cB Wa Wa -An +PH cE Wa os @@ -28712,7 +28683,7 @@ YA YA cm cm -BR +XC EE YA cm @@ -28824,7 +28795,7 @@ fe VM VM mJ -wv +KK mJ VM VM @@ -28846,13 +28817,13 @@ KT mu WD sY -wR +Fs sY Xd sY Xd Xd -AX +Oj cE Wa Wa @@ -28862,7 +28833,7 @@ Xd Xd Xd sY -hI +SM cE cE cE @@ -28871,9 +28842,9 @@ hC sY sY sY -uB +Tm Ky -WX +CD Tp zS Bg @@ -29150,13 +29121,13 @@ nH tv Cp nq -vT +dR WT Xv gi WT -je -yG +ub +bn Yf cE Wa @@ -29166,7 +29137,7 @@ WT Ky WT WT -yG +bn Wa Wa Wa @@ -29175,7 +29146,7 @@ iw WT Ky WT -yG +bn lu LA dz @@ -29303,7 +29274,7 @@ ss vz QB OW -Op +Ge LL Il LL @@ -29455,10 +29426,10 @@ XT kY bQ dz -Fu -wb +bv +vR EA -Jc +Ns IO dz dz @@ -29597,21 +29568,21 @@ EG EG EG dz -st -st -RU -st -st +Zn +Zn +bB +Zn +Zn dz vD iC af dz -Bv -Bv -WP -Bv -Bv +xR +xR +Qy +xR +xR dz EG EG @@ -29899,7 +29870,7 @@ AC dz EG dz -Nn +wy qt Qt Qt @@ -29909,7 +29880,7 @@ ST ee cC dz -TR +Uk oS Qt ST @@ -30053,22 +30024,22 @@ EG dz lu Uu -Dz -Dz -Kx -iU -Dz -pe +DT +DT +gl +wP +DT +iS cC dz cC eN -IW -yY -Rt -IW -IW -pe +YM +Ut +MN +YM +YM +iS cC dz EG @@ -30210,7 +30181,7 @@ VD VD jY jY -Ix +lF ts dz WG @@ -30220,7 +30191,7 @@ VD VD VD jY -ZV +EJ JK dz EG @@ -30362,7 +30333,7 @@ cC lu lu jY -Ix +lF cC dz cC @@ -30372,7 +30343,7 @@ lu cC lu Xe -ZV +EJ ci dz EG @@ -30514,7 +30485,7 @@ cC lu lu VD -Ix +lF Gb dz cC @@ -30524,7 +30495,7 @@ lu cC lu jY -ZV +EJ jk dz EG @@ -30666,7 +30637,7 @@ cC lk cC VD -wa +gJ cC dz cC @@ -30676,7 +30647,7 @@ cC lu lu jY -lm +ry lu dz EG @@ -30818,7 +30789,7 @@ cC lu lu ew -cv +Ru cC dz rZ @@ -30828,7 +30799,7 @@ cC lu lu jY -lK +uw lu dz EG @@ -30970,7 +30941,7 @@ lu lu lu VD -ZY +ym cC dz kc @@ -30980,7 +30951,7 @@ lu lu lu jY -mo +qc lu dz EG @@ -31122,7 +31093,7 @@ VD jY VD jY -xn +sG ts dz mX @@ -31132,7 +31103,7 @@ VD VD jY jY -lK +uw Mv dz EG @@ -31268,23 +31239,23 @@ EG EG dz cC -LM -pO -LK -LK -LK -gd -dH +Ug +pt +JT +JT +JT +pT +sl cC dz cC -uH -Zx -XW -XW -XW -XW -zi +ZS +BA +uf +uf +uf +uf +CF cC dz EG diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm index ad495d23b9..439969153d 100644 --- a/maps/map_files/rover/rover.dmm +++ b/maps/map_files/rover/rover.dmm @@ -42,13 +42,13 @@ /area/golden_arrow/canteen) "ax" = ( /obj/structure/machinery/prop{ + desc = "Yeah, it got fucked up during FORECON operation in iron forests of LV-711. Literally - the trees there were too tough even for tanks: threads, transmission and even turret rotation motors are now chilling somewhere in repair bay."; icon = 'icons/obj/vehicles/tank.dmi'; icon_state = "tank_base"; layer = 3.9; - pixel_x = -16; - pixel_y = -17; name = "M34A2 Longstreet Light Tank 'Lawnmower'"; - desc = "Yeah, it got fucked up during FORECON operation in iron forests of LV-711. Literally - the trees there were too tough even for tanks: threads, transmission and even turret rotation motors are now chilling somewhere in repair bay." + pixel_x = -16; + pixel_y = -17 }, /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer, @@ -69,8 +69,8 @@ /area/golden_arrow/canteen) "aC" = ( /obj/structure/closet/secure_closet/smartgunner_forecon{ - req_one_access = list(); - req_access_txt = "14;39" + req_access_txt = "14;39"; + req_one_access = list() }, /turf/open/floor/almayer, /area/golden_arrow/squad_one) @@ -102,9 +102,9 @@ layer = 2.9 }, /obj/structure/largecrate/random/secure{ - pixel_y = 17; + layer = 5.2; pixel_x = 7; - layer = 5.2 + pixel_y = 17 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -172,10 +172,14 @@ pixel_y = 29 }, /obj/structure/sign/poster/music{ - pixel_y = 34; + pixel_x = 8; + pixel_y = 34 + }, +/obj/structure/gun_rack/m41/recon/unloaded, +/obj/item/attachable/attached_gun/grenade/mk1{ + pixel_y = 15; pixel_x = 8 }, -/obj/structure/gun_rack/m41/unloaded, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -191,8 +195,8 @@ "cl" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/sign/safety/distribution_pipes{ - pixel_y = 8; - pixel_x = 32 + pixel_x = 32; + pixel_y = 8 }, /obj/structure/sign/safety/rewire{ pixel_x = 32; @@ -241,6 +245,7 @@ "ct" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/sniper, +/obj/item/attachable/attached_gun/grenade/mk1, /turf/open/floor/almayer, /area/golden_arrow/dorms) "cJ" = ( @@ -376,8 +381,8 @@ "dB" = ( /obj/structure/machinery/door/airlock/almayer/generic/glass{ dir = 1; - req_one_access_txt = "12;32"; - name = "\improper Assistant Squad Leader" + name = "\improper Assistant Squad Leader"; + req_one_access_txt = "12;32" }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -467,8 +472,8 @@ pixel_x = -8 }, /obj/item/prop/almayer/handheld1{ - pixel_y = 12; - pixel_x = 9 + pixel_x = 9; + pixel_y = 12 }, /obj/structure/machinery/floodlight/landing/floor{ layer = 2.79 @@ -503,8 +508,8 @@ "ez" = ( /obj/structure/machinery/camera/autoname/golden_arrow, /obj/structure/sign/safety/commline_connection{ - pixel_y = 29; - pixel_x = 16 + pixel_x = 16; + pixel_y = 29 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -621,8 +626,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/food_storage{ - pixel_y = 35; - pixel_x = -20 + pixel_x = -20; + pixel_y = 35 }, /turf/open/floor/almayer{ icon_state = "cargo_arrow" @@ -636,13 +641,13 @@ /area/golden_arrow/hangar) "fn" = ( /obj/structure/prop{ - name = "\improper comfy HE orbital warhead"; + can_buckle = 1; desc = "Rover barely uses it's OB cannon anyway, so this poor baby is stuck here..."; - icon_state = "ob_warhead_1"; icon = 'icons/obj/structures/props/almayer_props.dmi'; - can_buckle = 1; - pixel_y = -10; - layer = 5.2 + icon_state = "ob_warhead_1"; + layer = 5.2; + name = "\improper comfy HE orbital warhead"; + pixel_y = -10 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -723,8 +728,8 @@ "fK" = ( /obj/structure/largecrate/random, /obj/structure/largecrate/random{ - pixel_y = 16; - pixel_x = -3 + pixel_x = -3; + pixel_y = 16 }, /turf/open/floor/almayer, /area/golden_arrow/hangar) @@ -974,9 +979,9 @@ pixel_y = -15 }, /obj/structure/machinery/light{ + pixel_x = -17; unacidable = 1; - unslashable = 1; - pixel_x = -17 + unslashable = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -992,8 +997,8 @@ "iy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/commline_connection{ - pixel_y = -29; - pixel_x = 15 + pixel_x = 15; + pixel_y = -29 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1112,9 +1117,9 @@ "jG" = ( /obj/structure/largecrate/random/barrel/blue, /obj/structure/largecrate/random/barrel/green{ + layer = 3.01; pixel_x = 12; - pixel_y = 22; - layer = 3.01 + pixel_y = 22 }, /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -1264,8 +1269,8 @@ "lh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/forecon{ - req_one_access_txt = "8;12;13;39"; - req_access = list() + req_access = list(); + req_one_access_txt = "8;12;13;39" }, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -1290,6 +1295,10 @@ pixel_x = -6; pixel_y = 8 }, +/obj/item/attachable/attached_gun/grenade/mk1{ + pixel_y = -1; + pixel_x = 6 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -1361,8 +1370,8 @@ /area/golden_arrow/hangar) "lB" = ( /obj/structure/ladder{ - id = "rover2"; - height = -1 + height = -1; + id = "rover2" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1388,9 +1397,9 @@ "lN" = ( /obj/structure/machinery/power/smes/buildable, /obj/item/clothing/ears/earmuffs{ - pixel_y = 16; icon_state = "earmuffs2"; - item_state = "earmuffs2" + item_state = "earmuffs2"; + pixel_y = 16 }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) @@ -1432,7 +1441,19 @@ /turf/open/floor/almayer, /area/golden_arrow/hangar) "ml" = ( -/obj/structure/machinery/chem_master, +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/plush/therapy/blue{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/toy/plush/therapy/orange{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/toy/plush/therapy/red{ + pixel_x = -7; + pixel_y = 2 + }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -1469,10 +1490,10 @@ /area/golden_arrow/cryo_cells) "mJ" = ( /obj/structure/largecrate, -/obj/structure/largecrate{ - pixel_y = 16 - }, /obj/structure/machinery/light, +/obj/structure/largecrate/supply/ammo/m41amk1{ + pixel_y = 15 + }, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -1530,8 +1551,8 @@ /obj/structure/surface/table/almayer, /obj/item/storage/box/m94/signal, /obj/item/storage/box/m94/signal{ - pixel_y = 5; - pixel_x = 5 + pixel_x = 5; + pixel_y = 5 }, /obj/item/device/binoculars/range/designator, /turf/open/floor/almayer{ @@ -1564,8 +1585,8 @@ /area/golden_arrow/squad_one) "nH" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ - name = "\improper Hangar Lockdown Blast Door"; - dir = 4 + dir = 4; + name = "\improper Hangar Lockdown Blast Door" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1653,9 +1674,9 @@ dir = 1 }, /obj/structure/machinery/light{ + pixel_x = -17; unacidable = 1; - unslashable = 1; - pixel_x = -17 + unslashable = 1 }, /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -1663,8 +1684,8 @@ /area/golden_arrow/canteen) "ph" = ( /obj/structure/cargo_container/lockmart/right{ - pixel_y = 5; - layer = 5.2 + layer = 5.2; + pixel_y = 5 }, /turf/open/floor/almayer, /area/golden_arrow/hangar) @@ -1730,8 +1751,8 @@ /area/golden_arrow/squad_one) "pS" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ - name = "\improper Hangar Lockdown Blast Door"; - dir = 4 + dir = 4; + name = "\improper Hangar Lockdown Blast Door" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1830,8 +1851,8 @@ /area/golden_arrow/squad_one) "qy" = ( /obj/structure/ladder{ - id = "rover3"; - height = -1 + height = -1; + id = "rover3" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1918,12 +1939,12 @@ desc = "Nobody knows how a mannequin got aboard, but last Halloween it got dressed up as Voorhees and scared the shit out of new guy. Heh, good times."; icon = 'icons/mob/humans/species/r_synthetic.dmi'; icon_state = "Synthetic_Template"; - name = "mannequin"; - indestructible = 1 + indestructible = 1; + name = "mannequin" }, /obj/item/clothing/under/gimmick/jason{ - icon = 'icons/mob/humans/onmob/uniform_1.dmi'; - anchored = 1 + anchored = 1; + icon = 'icons/mob/humans/onmob/uniform_1.dmi' }, /obj/item/clothing/suit/gimmick/jason{ anchored = 1 @@ -1932,16 +1953,16 @@ anchored = 1 }, /obj/item/clothing/shoes/jackboots{ - icon = 'icons/mob/humans/onmob/feet.dmi'; - anchored = 1 + anchored = 1; + icon = 'icons/mob/humans/onmob/feet.dmi' }, /obj/item/clothing/gloves/brown{ anchored = 1; icon = 'icons/mob/humans/onmob/hands.dmi' }, /obj/item/weapon/sword/machete{ - icon = 'icons/mob/humans/onmob/items_lefthand_0.dmi'; - anchored = 1 + anchored = 1; + icon = 'icons/mob/humans/onmob/items_lefthand_0.dmi' }, /turf/open/floor/plating, /area/golden_arrow/hangar) @@ -2101,8 +2122,8 @@ "sB" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/cmcap/boonie/tan{ - pixel_y = -6; - pixel_x = -8 + pixel_x = -8; + pixel_y = -6 }, /obj/item/clothing/head/cmcap{ layer = 4.1; @@ -2117,8 +2138,8 @@ /area/golden_arrow/hangar) "sN" = ( /obj/structure/anti_air_cannon{ - pixel_y = 8; - pixel_x = -13 + pixel_x = -13; + pixel_y = 8 }, /turf/open/floor/almayer_hull{ dir = 10; @@ -2435,12 +2456,12 @@ "wd" = ( /obj/structure/surface/table/almayer, /obj/item/prop/magazine/boots/n117{ - pixel_y = 3; - pixel_x = -5 + pixel_x = -5; + pixel_y = 3 }, /obj/item/reagent_container/food/drinks/cans/souto/lime{ - pixel_y = 3; - pixel_x = 9 + pixel_x = 9; + pixel_y = 3 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -2483,7 +2504,7 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) "wx" = ( -/obj/structure/bed/chair/office/light, +/obj/structure/bed/chair/office/dark, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -2735,8 +2756,8 @@ dir = 4 }, /obj/structure/closet/secure_closet/marine_personal{ - job = "Platoon Sergeant"; - has_cryo_gear = 0 + has_cryo_gear = 0; + job = "Platoon Sergeant" }, /obj/item/clothing/shoes/marine/jungle/knife, /obj/item/device/radio/headset/almayer/sof/survivor_forecon, @@ -2782,8 +2803,8 @@ pixel_x = -8 }, /obj/item/reagent_container/food/drinks/coffee/marine{ - pixel_y = 10; - pixel_x = -7 + pixel_x = -7; + pixel_y = 10 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -2804,14 +2825,30 @@ /area/golden_arrow/dorms) "As" = ( /obj/structure/closet/crate/green, -/obj/item/rappel_harness, -/obj/item/rappel_harness, -/obj/item/rappel_harness, -/obj/item/rappel_harness, -/obj/item/rappel_harness, -/obj/item/rappel_harness, -/obj/item/rappel_harness, -/obj/item/rappel_harness, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, +/obj/item/rappel_harness/extract{ + shuttle_id = "dropship_cyclone" + }, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -2842,9 +2879,9 @@ force = 15; layer = 4.1; name = "Commando Huggs"; + pixel_x = 9; pixel_y = 3; - throwforce = 15; - pixel_x = 9 + throwforce = 15 }, /obj/item/clothing/head/cmcap{ layer = 4.1; @@ -2871,6 +2908,8 @@ /area/golden_arrow/cryo_cells) "AD" = ( /obj/structure/closet/crate/trashcart, +/obj/item/attachable/attached_gun/grenade/mk1, +/obj/item/attachable/attached_gun/grenade/mk1, /turf/open/floor/plating, /area/golden_arrow/hangar) "AF" = ( @@ -2903,8 +2942,8 @@ }, /obj/item/clothing/mask/cigarette/weed, /obj/item/tool/lighter/zippo/gold{ - pixel_y = -5; - pixel_x = 10 + pixel_x = 10; + pixel_y = -5 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -3029,8 +3068,8 @@ /area/golden_arrow/supply) "CO" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/supply/ammo/m41amk1, -/obj/structure/largecrate/supply/ammo/m41amk1{ +/obj/structure/largecrate/supply/ammo/m41amk1/forecon, +/obj/structure/largecrate/supply/ammo/m41amk1/forecon{ pixel_x = 3; pixel_y = 10 }, @@ -3075,7 +3114,7 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/cryo_cells) "Dx" = ( -/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access, +/obj/structure/machinery/cm_vending/gear/medic_chemical, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -3157,13 +3196,13 @@ "Ev" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; - pixel_y = -9; - pixel_x = -6 + pixel_x = -6; + pixel_y = -9 }, /obj/structure/prop/invuln/overhead_pipe{ dir = 4; - pixel_y = -9; - pixel_x = 13 + pixel_x = 13; + pixel_y = -9 }, /obj/structure/curtain/red{ pixel_y = -21 @@ -3181,13 +3220,13 @@ "Ey" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/prop_gun{ - prop_gun_type = /obj/item/weapon/gun/smg/m39; custom_gun_desc = "Welp. Too delicate for jungles, it seems. Nothing beats MK1."; - custom_gun_name = "Broken M39 submachinegun" + custom_gun_name = "Broken M39 submachinegun"; + prop_gun_type = /obj/item/weapon/gun/smg/m39 }, /obj/item/tool/screwdriver/tactical{ - pixel_y = -3; - pixel_x = -9 + pixel_x = -9; + pixel_y = -3 }, /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -3201,7 +3240,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/gun_rack/m41/unloaded, +/obj/structure/gun_rack/m41/recon/unloaded, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -3274,8 +3313,8 @@ pixel_y = 27 }, /obj/structure/sign/safety/autodoc{ - pixel_y = 27; - pixel_x = 13 + pixel_x = 13; + pixel_y = 27 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -3466,8 +3505,8 @@ "HQ" = ( /obj/structure/machinery/door/airlock/almayer/generic/glass{ dir = 1; - req_one_access_txt = "12;13;32"; - name = "\improper Radio Telephone Operator" + name = "\improper Radio Telephone Operator"; + req_one_access_txt = "12;13;32" }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -3531,13 +3570,13 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/prop/ice_colony/tiger_rug{ - pixel_x = -13; - layer = 2.5; - pixel_y = -15; desc = "It's a rug, made from real tiger! Well, not *real* real tiger - this pelt belonged to similar-looking species, native to LV-842, that Snake Eaters ran over with their ATV. It still has some tire prints visible here and there..."; - icon_state = "HotlineAlt"; dir = 4; - name = "moon tiger rug" + icon_state = "HotlineAlt"; + layer = 2.5; + name = "moon tiger rug"; + pixel_x = -13; + pixel_y = -15 }, /turf/open/floor/almayer, /area/golden_arrow/dorms) @@ -3555,9 +3594,9 @@ /area/golden_arrow/prep_hallway) "IM" = ( /obj/structure/machinery/light{ + pixel_x = -17; unacidable = 1; - unslashable = 1; - pixel_x = -17 + unslashable = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -3574,9 +3613,9 @@ /obj/structure/machinery/recharger, /obj/item/reagent_container/spray/cleaner, /obj/structure/machinery/light{ + dir = 1; unacidable = 1; - unslashable = 1; - dir = 1 + unslashable = 1 }, /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -3587,8 +3626,8 @@ dir = 4 }, /obj/item/clothing/head/headset{ - pixel_y = 8; - pixel_x = -6 + pixel_x = -6; + pixel_y = 8 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -3637,8 +3676,8 @@ "JS" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/clothing/glasses/welding{ - pixel_y = 8; - pixel_x = -7 + pixel_x = -7; + pixel_y = 8 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -3647,8 +3686,8 @@ "JV" = ( /obj/structure/barricade/handrail{ dir = 1; - pixel_y = 10; - layer = 3.01 + layer = 3.01; + pixel_y = 10 }, /obj/structure/machinery/conveyor{ dir = 8 @@ -3672,8 +3711,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/marine_personal{ - job = "Smartgunner"; - has_cryo_gear = 0 + has_cryo_gear = 0; + job = "Smartgunner" }, /obj/item/clothing/shoes/marine/jungle/knife, /obj/item/device/radio/headset/almayer/sof/survivor_forecon, @@ -3730,8 +3769,8 @@ /area/golden_arrow/canteen) "Kp" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/forecon{ - req_one_access_txt = "8;12;13;39"; - req_access = list() + req_access = list(); + req_one_access_txt = "8;12;13;39" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -3847,12 +3886,12 @@ pixel_x = 11 }, /obj/structure/largecrate/random/mini/ammo{ - pixel_y = 10; - pixel_x = -5 + pixel_x = -5; + pixel_y = 10 }, /obj/structure/largecrate/random/mini/ammo{ - pixel_y = 10; - pixel_x = 12 + pixel_x = 12; + pixel_y = 10 }, /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -4074,10 +4113,10 @@ "NI" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1; + dir = 1; pixel_x = -17; - dir = 1 + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -4204,8 +4243,8 @@ /area/golden_arrow/prep_hallway) "OU" = ( /obj/structure/closet/secure_closet/marine_personal{ - job = "Squad Sergeant"; - has_cryo_gear = 0 + has_cryo_gear = 0; + job = "Squad Sergeant" }, /obj/item/clothing/shoes/marine/jungle/knife, /obj/item/device/radio/headset/almayer/sof/survivor_forecon, @@ -4245,11 +4284,10 @@ /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) "Pt" = ( -/obj/structure/machinery/chem_dispenser, -/obj/item/reagent_container/glass/beaker/bluespace, -/obj/item/storage/box/pillbottles{ - pixel_y = 18; - pixel_x = -5 +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 1; + pixel_x = 1 }, /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -4384,8 +4422,8 @@ }, /obj/structure/barricade/handrail{ dir = 1; - pixel_y = 13; - layer = 3.01 + layer = 3.01; + pixel_y = 13 }, /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -4538,8 +4576,8 @@ /area/golden_arrow/hangar) "SR" = ( /obj/structure/closet/secure_closet/marine_personal{ - job = "Platoon Corpsman"; - has_cryo_gear = 0 + has_cryo_gear = 0; + job = "Platoon Corpsman" }, /obj/item/clothing/shoes/marine/jungle/knife, /obj/item/device/radio/headset/almayer/sof/survivor_forecon, @@ -4603,8 +4641,8 @@ /area/golden_arrow/hangar) "Tp" = ( /obj/structure/ladder{ - id = "rover1"; - height = -1 + height = -1; + id = "rover1" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -4994,15 +5032,15 @@ /obj/item/tool/kitchen/utensil/spoon{ desc = "Its tongs molded together after someone tried a bite of that arcturian curry."; name = "melted fork"; - pixel_y = 9; - pixel_x = -9 + pixel_x = -9; + pixel_y = 9 }, /obj/item/tool/kitchen/tray, /obj/item/reagent_container/food/snacks/resin_fruit{ - name = "arcturian curry"; desc = "Never let Joes cook alien cuisine. Eugh."; - pixel_y = 4; - pixel_x = 6 + name = "arcturian curry"; + pixel_x = 6; + pixel_y = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5028,8 +5066,8 @@ /area/golden_arrow/hangar) "ZC" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/forecon{ - req_one_access_txt = "8;12;13;39"; - req_access = list() + req_access = list(); + req_one_access_txt = "8;12;13;39" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -14863,7 +14901,7 @@ Kk wz rv Ll -ml +Dx Kk pB pB @@ -15167,7 +15205,7 @@ Kk Oc hN MN -Dx +ml wD Cl Cl diff --git a/maps/override_ground.json b/maps/override_ground.json index 94d3c70757..8cfc8e1ca0 100644 --- a/maps/override_ground.json +++ b/maps/override_ground.json @@ -1,15 +1,9 @@ { "override_map": true, - "map_name": "Unknown", - "survivor_types": [ - "/datum/equipment_preset/survivor/civilian", - "/datum/equipment_preset/survivor/goon" - ], + "map_name": "Area of Operation", "map_item_type": "/obj/item/map/big_red_map", - "announce_text": "We've lost contact with a Weyland-Yutani's research facility. The ###SHIPNAME### has been dispatched to assist.", - "monkey_types": [ - "neaera" - ], + "announce_text": "Now in orbit above Area of Operation.", + "camouflage": "jungle", "traits": [{ "Ground": true }], "gamemodes": [ "Distress Signal", diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index b29f7255c2..907129fedb 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -32,7 +32,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 0 }, - "camouflage": "classic", + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/shuttles/dropship_cyclone.dmm b/maps/shuttles/dropship_cyclone.dmm index e717f90657..4bf150c179 100644 --- a/maps/shuttles/dropship_cyclone.dmm +++ b/maps/shuttles/dropship_cyclone.dmm @@ -6,7 +6,9 @@ }, /area/shuttle/cyclone) "aP" = ( -/obj/structure/shuttle/part/dropship2/left_outer_wing_connector, +/obj/structure/shuttle/part/dropship2/left_outer_wing_connector{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "bw" = ( @@ -15,7 +17,9 @@ }, /area/shuttle/cyclone) "cj" = ( -/obj/structure/shuttle/part/dropship2/nose_front_left, +/obj/structure/shuttle/part/dropship2/nose_front_left{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "cm" = ( @@ -33,7 +37,9 @@ }, /area/shuttle/cyclone) "cJ" = ( -/obj/structure/shuttle/part/dropship2/transparent/outer_left_weapons, +/obj/structure/shuttle/part/dropship2/transparent/outer_left_weapons{ + name = "\improper Cyclone" + }, /obj/effect/attach_point/weapon/midway/right_fore{ ship_tag = "dropship_cyclone" }, @@ -62,11 +68,15 @@ }, /area/shuttle/cyclone) "eT" = ( -/obj/structure/shuttle/part/dropship2/transparent/left_outer_bottom_wing, +/obj/structure/shuttle/part/dropship2/transparent/left_outer_bottom_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "fo" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap, +/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "fr" = ( @@ -100,22 +110,29 @@ /area/shuttle/cyclone) "hd" = ( /obj/effect/attach_point/fuel/dropship2{ - pixel_x = -32 + pixel_x = -32; + ship_tag = "dropship_cyclone" }, /turf/closed/shuttle/cyclone/transparent{ icon_state = "33" }, /area/shuttle/cyclone) "hu" = ( -/obj/structure/shuttle/part/dropship2/transparent/right_outer_bottom_wing, +/obj/structure/shuttle/part/dropship2/transparent/right_outer_bottom_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "hS" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap, +/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "hV" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_right_exhaust, +/obj/structure/shuttle/part/dropship2/transparent/engine_right_exhaust{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "ia" = ( @@ -127,12 +144,15 @@ }, /area/shuttle/cyclone) "iO" = ( -/obj/structure/shuttle/part/dropship2/right_inner_wing_connector, +/obj/structure/shuttle/part/dropship2/right_inner_wing_connector{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "jr" = ( /obj/effect/attach_point/crew_weapon/midway{ - ship_tag = "dropship_cyclone" + ship_tag = "dropship_cyclone"; + dir = 8 }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" @@ -166,7 +186,9 @@ }, /area/shuttle/cyclone) "mO" = ( -/obj/structure/shuttle/part/dropship2/transparent/upper_left_wing, +/obj/structure/shuttle/part/dropship2/transparent/upper_left_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "nj" = ( @@ -210,7 +232,9 @@ }, /area/shuttle/cyclone) "pz" = ( -/obj/structure/shuttle/part/dropship2/transparent/middle_left_wing, +/obj/structure/shuttle/part/dropship2/transparent/middle_left_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "qj" = ( @@ -237,8 +261,19 @@ icon_state = "48" }, /area/shuttle/cyclone) +"rk" = ( +/obj/effect/attach_point/crew_weapon/midway{ + ship_tag = "dropship_cyclone"; + dir = 4 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/cyclone) "ro" = ( -/obj/structure/shuttle/part/dropship2/nose_front_right, +/obj/structure/shuttle/part/dropship2/nose_front_right{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "rB" = ( @@ -285,7 +320,9 @@ }, /area/shuttle/cyclone) "vT" = ( -/obj/structure/shuttle/part/dropship2/transparent/right_inner_bottom_wing, +/obj/structure/shuttle/part/dropship2/transparent/right_inner_bottom_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "wk" = ( @@ -297,11 +334,15 @@ }, /area/shuttle/cyclone) "xY" = ( -/obj/structure/shuttle/part/dropship2/lower_left_wall, +/obj/structure/shuttle/part/dropship2/lower_left_wall{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "yA" = ( -/obj/structure/shuttle/part/dropship2/transparent/nose_center, +/obj/structure/shuttle/part/dropship2/transparent/nose_center{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "yP" = ( @@ -329,7 +370,9 @@ }, /area/shuttle/cyclone) "zL" = ( -/obj/structure/shuttle/part/dropship2/transparent/nose_top_right, +/obj/structure/shuttle/part/dropship2/transparent/nose_top_right{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Ak" = ( @@ -342,13 +385,15 @@ }, /area/shuttle/cyclone) "At" = ( -/obj/structure/shuttle/part/dropship2/lower_right_wall, +/obj/structure/shuttle/part/dropship2/lower_right_wall{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Ax" = ( /obj/structure/blocker/invisible_wall, /obj/structure/machinery/computer/cameras/dropship/two{ - name = "\improper 'Cyclon' camera controls"; + name = "\improper 'Cyclone' camera controls"; network = list("Cyclone","Laser Targets") }, /turf/open/shuttle/dropship{ @@ -374,19 +419,27 @@ }, /area/shuttle/cyclone) "Cb" = ( -/obj/structure/shuttle/part/dropship2/transparent/upper_right_wing, +/obj/structure/shuttle/part/dropship2/transparent/upper_right_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Cf" = ( -/obj/structure/shuttle/part/dropship2/left_inner_wing_connector, +/obj/structure/shuttle/part/dropship2/left_inner_wing_connector{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Da" = ( -/obj/structure/shuttle/part/dropship2/transparent/engine_left_exhaust, +/obj/structure/shuttle/part/dropship2/transparent/engine_left_exhaust{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Df" = ( -/obj/structure/shuttle/part/dropship2/right_outer_wing_connector, +/obj/structure/shuttle/part/dropship2/right_outer_wing_connector{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Dl" = ( @@ -414,7 +467,9 @@ }, /area/shuttle/cyclone) "Fz" = ( -/obj/effect/attach_point/fuel/dropship2, +/obj/effect/attach_point/fuel/dropship2{ + ship_tag = "dropship_cyclone" + }, /turf/closed/shuttle/cyclone/transparent{ icon_state = "28" }, @@ -460,14 +515,18 @@ /area/shuttle/cyclone) "IP" = ( /obj/effect/attach_point/weapon/dropship2/left_wing, -/obj/structure/shuttle/part/dropship2/transparent/lower_left_wing, +/obj/structure/shuttle/part/dropship2/transparent/lower_left_wing{ + name = "\improper Cyclone" + }, /obj/effect/attach_point/weapon/midway/left_wing{ ship_tag = "dropship_cyclone" }, /turf/template_noop, /area/shuttle/cyclone) "IZ" = ( -/obj/structure/shuttle/part/dropship2/transparent/middle_right_wing, +/obj/structure/shuttle/part/dropship2/transparent/middle_right_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "JZ" = ( @@ -511,7 +570,7 @@ /area/shuttle/cyclone) "MU" = ( /obj/structure/machinery/computer/dropship_weapons/dropship2{ - name = "\improper 'Cyclon' weapons controls" + name = "\improper 'Cyclone' weapons controls" }, /obj/structure/phone_base/rotary{ name = "Cyclone Telephone"; @@ -548,14 +607,18 @@ /area/shuttle/cyclone) "QN" = ( /obj/effect/attach_point/weapon/dropship2/right_wing, -/obj/structure/shuttle/part/dropship2/transparent/lower_right_wing, +/obj/structure/shuttle/part/dropship2/transparent/lower_right_wing{ + name = "\improper Cyclone" + }, /obj/effect/attach_point/weapon/midway/right_wing{ ship_tag = "dropship_cyclone" }, /turf/template_noop, /area/shuttle/cyclone) "RR" = ( -/obj/structure/shuttle/part/dropship2/transparent/nose_top_left, +/obj/structure/shuttle/part/dropship2/transparent/nose_top_left{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "Sk" = ( @@ -616,12 +679,15 @@ "Zd" = ( /obj/structure/shuttle/part/dropship2/transparent/outer_right_weapons, /obj/effect/attach_point/weapon/midway/left_fore{ - ship_tag = "dropship_cyclone" + ship_tag = "dropship_cyclone"; + name = "\improper Cyclone" }, /turf/template_noop, /area/shuttle/cyclone) "ZG" = ( -/obj/structure/shuttle/part/dropship2/transparent/left_outer_inner_wing, +/obj/structure/shuttle/part/dropship2/transparent/left_outer_inner_wing{ + name = "\improper Cyclone" + }, /turf/template_noop, /area/shuttle/cyclone) "ZU" = ( @@ -759,7 +825,7 @@ Kv ml oX FD -jr +rk JZ qX GE diff --git a/tgui/packages/tgui/interfaces/GameMaster.js b/tgui/packages/tgui/interfaces/GameMaster.js index 32949fea54..fa0312c01a 100644 --- a/tgui/packages/tgui/interfaces/GameMaster.js +++ b/tgui/packages/tgui/interfaces/GameMaster.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Dropdown, Button, Section, Slider, Collapsible, Stack, Divider } from '../components'; +import { Dropdown, Box, Button, Section, Slider, Collapsible, Stack, Divider } from '../components'; import { Window } from '../layouts'; export const GameMaster = (props, context) => { @@ -216,18 +216,22 @@ export const GameMasterCommunicationPanel = (props, context) => { }} /> - Communication Clarity + Radio Clarity { - act('set_communication_clarity', { clarity }); + act('set_radio_clarity', { clarity }); }} /> + + {`"${data.radio_clarity_example}"`} + ); diff --git a/tgui/packages/tgui/interfaces/ResinPanel.tsx b/tgui/packages/tgui/interfaces/ResinPanel.tsx new file mode 100644 index 0000000000..e4587fe826 --- /dev/null +++ b/tgui/packages/tgui/interfaces/ResinPanel.tsx @@ -0,0 +1,94 @@ +import { useBackend } from 'tgui/backend'; +import { Box, Button, Dropdown, Section, Stack, Tabs } from 'tgui/components'; +import { Window } from 'tgui/layouts'; +import { BooleanLike, classes } from 'common/react'; + +interface ResinPanelData { + structure_list: StructureEntry[]; + hives_list: string[]; + selected_structure: string; + selected_hive: string; + build_click_intercept: BooleanLike; +} + +interface StructureEntry { + name: string; + image: string; + id: string; +} + +export const ResinPanel = (props, context) => { + const { act, data } = useBackend(context); + const { + structure_list, + hives_list, + selected_structure, + selected_hive, + build_click_intercept, + } = data; + + let compact = false; + + return ( + + +
    + +
    +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/SoundPanel.tsx b/tgui/packages/tgui/interfaces/SoundPanel.tsx new file mode 100644 index 0000000000..645bf037b7 --- /dev/null +++ b/tgui/packages/tgui/interfaces/SoundPanel.tsx @@ -0,0 +1,438 @@ +import { useBackend, useLocalState } from 'tgui/backend'; +import { Box, Button, Dropdown, Input, Section, Slider, Stack, Tabs } from 'tgui/components'; +import { Window } from 'tgui/layouts'; +import { Component, Fragment } from 'inferno'; +import { debounce } from 'common/timer'; + +interface SoundPanelData { + sound_list: string[]; + category_list: string[]; + zlevel_list: string[]; + group_list: string[]; + sound_path: string; + sound_category: number; + sound_volume: number; + sound_pitch: number; + sound_duration: number; + target_player_desc: string; + target_loc_desc: string; + loc_click_intercept: string; + loc_click_play: string; + target_zlevel: string; + target_group: string; +} + +export const SoundPanel = (props, context) => { + const { act, data } = useBackend(context); + const { sound_list, sound_path } = data; + + const PAGES = [ + { + title: 'Client', + component: , + }, + { + title: 'Local', + component: , + }, + { + title: 'ZLevel', + component: , + }, + { + title: 'Server', + component: , + }, + ]; + const [tabIndex, setTabIndex] = useLocalState( + context, + 'tabIndex', + PAGES.findIndex((page) => page.title === 'Local') + ); + + return ( + + + + + + + act('set_sound_path', { sound_path: value }) + } + /> + + + + + + + + +
    + + {PAGES.map((page, i) => { + return ( + setTabIndex(i)}> + {page.title} + + ); + })} + + {PAGES[tabIndex].component} +
    +     +     +     +     +     +     + ); +}; + +interface ListSearchBoxProps { + items: string[]; + selection: string; + onSelection: (value: string) => void; +} + +interface ListSearchBoxState { + query: string; + // selection: string; +} + +interface ListSearchBoxEntry { + id: number; + fileName: string; + dirName: string; + fullPath: string; +} + +class ListSearchBox extends Component { + state: ListSearchBoxState = { + query: '', + }; + handleQueryChange(value: string) { + if (value === this.state.query) { + return; + } + this.setState({ + query: value, + }); + this.handleSelectionChange(''); + } + handleSelectionChange(value: string) { + this.props.onSelection(value); + } + + onSearch = debounce((value: string) => { + this.handleQueryChange(value); + }, 250); + + parsedItems = this.props.items + .map((item, index) => { + const dirIndex = item.lastIndexOf('/'); + const dirName = item.slice(6, dirIndex); + const extIndex = item.lastIndexOf('.'); + const fileName = item.slice(dirIndex + 1, extIndex); + + return { + id: index, + fileName: fileName, + dirName: dirName, + fullPath: item, + }; + }) + .sort((a, b) => { + if (a.fileName > b.fileName) return 1; + if (a.fileName < b.fileName) return -1; + if (a.dirName > b.dirName) return 1; + if (a.dirName < b.dirName) return -1; + return a.id - b.id; + }); + + render() { + return ( + + +
    + {this.parsedItems + .filter((item, index) => { + return item.fileName + .toLowerCase() + .includes(this.state.query.toLowerCase()); + }) + .map((item) => { + return ( + + ); + })} +
    +     + + this.onSearch(value)} + placeholder="Search..." + value={this.state.query} + /> + +     + ); + } +} + +const SoundOptions = (props, context) => { + const { act, data } = useBackend(context); + const { + category_list, + sound_path, + sound_category, + sound_volume, + sound_pitch, + sound_duration, + } = data; + + return ( +
    + + + + + + Category + + + act('set_sound_category', { sound_category: value }) + } + options={category_list} + selected={sound_category} + /> + + + + Volume + + + act('set_sound_volume', { sound_volume: value }) + } + /> + + + + + + + + Pitch + + + act('set_sound_pitch', { sound_pitch: value }) + } + /> + + + + Duration + + + act('set_sound_duration', { sound_duration: value }) + } + /> + + + + + + +
    + ); +}; + +const ClientPage = (props, context) => { + const { act, data } = useBackend(context); + const { target_player_desc, sound_path } = data; + + return ( + + +