From bcfa25e29e9442ffba7a49396b00912c6897e347 Mon Sep 17 00:00:00 2001
From: AndroBetel <44546836+AndroBetel@users.noreply.github.com>
Date: Sat, 18 May 2024 01:39:29 +0300
Subject: [PATCH 01/45] initial
---
code/__DEFINES/job.dm | 2 +-
code/__DEFINES/mode.dm | 2 +-
code/datums/vehicles.dm | 9 +
code/game/area/IceColony.dm | 2 +-
code/game/area/Sulaco.dm | 27 +
code/game/area/shiva.dm | 108 +-
.../colonialmarines/ai/colonialmarines_ai.dm | 2 +-
code/game/jobs/job/civilians/other/liaison.dm | 7 +
.../jobs/job/civilians/support/synthetic.dm | 9 +
.../game/jobs/job/command/cic/staffofficer.dm | 4 +-
code/game/jobs/job/marine/squads.dm | 6 +-
code/game/machinery/doors/door.dm | 6 +
.../vendor_types/squad_prep/squad_prep.dm | 2 +-
code/game/objects/structures/ladders.dm | 3 +
code/game/supplyshuttle.dm | 35 +-
code/game/turfs/closed.dm | 17 +
code/modules/clothing/under/ties.dm | 5 +
code/modules/cm_tech/implements/tank.dm | 4 +-
code/modules/gear_presets/uscm_ship.dm | 26 +-
code/modules/maptext_alerts/text_blurbs.dm | 2 +-
.../specialist/launcher/rocket_launcher.dm | 6 +
.../projectiles/magazines/specialist.dm | 5 +
code/modules/shuttle/shuttles/dropship.dm | 8 +
code/modules/shuttle/vehicle_elevator.dm | 2 +-
code/modules/vehicles/apc/apc_movie.dm | 12 +
.../vehicles/hardpoints/primary/ltb.dm | 3 +
code/modules/vehicles/multitile/multitile.dm | 2 +
code/modules/vehicles/tank/tank.dm | 25 +
icons/mob/humans/onmob/ties.dmi | Bin 20030 -> 20348 bytes
icons/obj/items/clothing/ties.dmi | Bin 22527 -> 22562 bytes
icons/obj/structures/machinery/computer.dmi | Bin 161723 -> 162316 bytes
icons/obj/vehicles/interiors/apc.dmi | Bin 20579 -> 20867 bytes
icons/obj/vehicles/interiors/tank.dmi | Bin 6961 -> 7167 bytes
icons/obj/vehicles/movieapc.dmi | Bin 82072 -> 86676 bytes
icons/obj/vehicles/tank.dmi | Bin 198430 -> 201142 bytes
icons/turf/dropship.dmi | Bin 8236 -> 8331 bytes
map_config/shipmaps.txt | 3 +
maps/interiors/apc_custom.dmm | 570 +
maps/interiors/tank_custom.dmm | 262 +
.../Ice_Colony_v3/Shivas_Snowball.dmm | 127 +-
maps/map_files/stalwart/stalwart.dmm | 28381 ++++++++++++++++
maps/shuttles/dropship_skully.dmm | 906 +
maps/shuttles/dropship_wrecker.dmm | 864 +
maps/stalwart.json | 9 +
sound/vehicles/horn_custom.ogg | Bin 0 -> 79002 bytes
45 files changed, 31287 insertions(+), 176 deletions(-)
create mode 100644 maps/interiors/apc_custom.dmm
create mode 100644 maps/interiors/tank_custom.dmm
create mode 100644 maps/map_files/stalwart/stalwart.dmm
create mode 100644 maps/shuttles/dropship_skully.dmm
create mode 100644 maps/shuttles/dropship_wrecker.dmm
create mode 100644 maps/stalwart.json
create mode 100644 sound/vehicles/horn_custom.ogg
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 18afc56b7c..fea257e632 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -3,7 +3,7 @@
#define GET_DEFAULT_ROLE(title) (RoleAuthority?.default_roles[title] ? RoleAuthority.default_roles[title] : title)
// Squad name defines
-#define SQUAD_MARINE_1 "Sun Riders"
+#define SQUAD_MARINE_1 "Iron Heads"
#define SQUAD_MARINE_2 "Bravo"
#define SQUAD_MARINE_3 "Charlie"
#define SQUAD_MARINE_4 "Delta"
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
index af2bfe3994..7deec81375 100644
--- a/code/__DEFINES/mode.dm
+++ b/code/__DEFINES/mode.dm
@@ -138,7 +138,7 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR
var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
-var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
+var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE, JOB_SYNTH, JOB_CORPORATE_LIAISON)
var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
diff --git a/code/datums/vehicles.dm b/code/datums/vehicles.dm
index 4c74ece75d..3ed5b793a7 100644
--- a/code/datums/vehicles.dm
+++ b/code/datums/vehicles.dm
@@ -30,6 +30,11 @@
name = "Movie APC"
interior_id = "apc_movie"
+/datum/map_template/interior/apc_custom
+ name = "Pit Stop APC"
+ interior_id = "apc_custom"
+
+
/datum/map_template/interior/arc
name = "ARC"
interior_id = "arc"
@@ -42,6 +47,10 @@
name = "Tank"
interior_id = "tank"
+/datum/map_template/interior/tank_custom
+ name = "Six Feet Thunder Tank"
+ interior_id = "tank_custom"
+
/datum/map_template/interior/van
name = "Van"
interior_id = "van"
diff --git a/code/game/area/IceColony.dm b/code/game/area/IceColony.dm
index 4474ce5236..727ceb32a2 100644
--- a/code/game/area/IceColony.dm
+++ b/code/game/area/IceColony.dm
@@ -31,7 +31,7 @@
power_light = FALSE
power_equip = FALSE
power_environ = FALSE
- temperature = ICE_COLONY_TEMPERATURE
+ temperature = 375
/*
* Exterior - Surface
diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm
index d498be21db..26dd5e64d4 100644
--- a/code/game/area/Sulaco.dm
+++ b/code/game/area/Sulaco.dm
@@ -149,6 +149,33 @@
return FALSE
return TRUE
+/area/shuttle/skully
+ name = "\improper Dropship Skully"
+ icon_state = "shuttlered"
+ base_muffle = MUFFLE_HIGH
+ soundscape_interval = 30
+ is_landing_zone = TRUE
+ ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/skully/Enter(atom/movable/O, atom/oldloc)
+ if(istype(O, /obj/structure/barricade))
+ return FALSE
+ return TRUE
+
+
+/area/shuttle/wrecker
+ name = "\improper Dropship Wrecker"
+ icon_state = "shuttlered"
+ base_muffle = MUFFLE_HIGH
+ soundscape_interval = 30
+ is_landing_zone = TRUE
+ ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/wrecker/Enter(atom/movable/O, atom/oldloc)
+ if(istype(O, /obj/structure/barricade))
+ return FALSE
+ return TRUE
+
//DISTRESS SHUTTLES
diff --git a/code/game/area/shiva.dm b/code/game/area/shiva.dm
index 9cfaffb7dc..0b74c0adf3 100644
--- a/code/game/area/shiva.dm
+++ b/code/game/area/shiva.dm
@@ -6,149 +6,149 @@
//ambience = list('figuresomethingout.ogg')
icon_state = "shiva"
can_build_special = TRUE //T-Comms structure
- temperature = ICE_COLONY_TEMPERATURE
+ temperature = 375
minimap_color = MINIMAP_AREA_COLONY
/area/shuttle/drop1/shiva
- name = "Shiva's Snowball - Dropship Alamo Landing Zone"
+ name = "Dropship Alamo Landing Zone"
icon_state = "shuttle"
icon = 'icons/turf/area_shiva.dmi'
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ
/area/shuttle/drop2/shiva
- name = "Shiva's Snowball - Dropship Normandy Landing Zone"
+ name = "Dropship Normandy Landing Zone"
icon_state = "shuttle2"
icon = 'icons/turf/area_shiva.dmi'
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior/lz1_console
- name = "Shiva's Snowball - Dropship Alamo Console"
+ name = "Dropship Alamo Console"
requires_power = FALSE
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior/lz1_console/two
- name = "Shiva's Snowball - Dropship Normandy Console"
+ name = "Dropship Normandy Console"
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior
- name = "Shiva's Snowball - Exterior"
+ name = "Exterior"
ceiling = CEILING_NONE
/area/shiva/interior
- name = "Shiva's Snowball - Interior"
+ name = "Interior"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
requires_power = TRUE
/area/shiva/interior/oob
- name = "Shiva's Snowball - Out Of Bounds"
+ name = "Out Of Bounds"
ceiling = CEILING_MAX
icon_state = "oob"
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
/area/shiva/interior/oob/dev_room
- name = "Shiva's Snowball - Secret Room"
+ name = "Secret Room"
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
icon_state = "shiva"
//telecomms areas - exterior
/area/shiva/exterior/telecomm
- name = "Shiva's Snowball - Communications Relay"
+ name = "Communications Relay"
icon_state = "ass_line"
is_resin_allowed = FALSE
/area/shiva/exterior/telecomm/lz1_north
- name = "Shiva's Snowball - North LZ1 Communications Relay"
+ name = "North LZ1 Communications Relay"
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior/telecomm/lz2_southeast
- name = "Shiva's Snowball - South-East LZ2 Communications Relay"
+ name = "South-East LZ2 Communications Relay"
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior/telecomm/lz2_northeast
- name = "Shiva's Snowball - North-East LZ2 Communications Relay"
+ name = "North-East LZ2 Communications Relay"
minimap_color = MINIMAP_AREA_LZ
//telecomms areas - interior
/area/shiva/interior/telecomm
- name = "Shiva's Snowball - Communications Relay"
+ name = "Communications Relay"
icon_state = "ass_line"
is_resin_allowed = FALSE
/area/shiva/interior/telecomm/lz1_biceps
- name = "Shiva's Snowball - Fort Biceps Communications Relay"
+ name = "Fort Biceps Communications Relay"
icon_state = "hangars0"
minimap_color = MINIMAP_AREA_LZ
/area/shiva/interior/telecomm/lz1_flight
- name = "Shiva's Snowball - LZ1 Aerodrome Communications Relay"
+ name = "LZ1 Aerodrome Communications Relay"
minimap_color = MINIMAP_AREA_LZ
/area/shiva/interior/telecomm/lz2_research
- name = "Shiva's Snowball - Argentinian Communications Relay"
+ name = "Argentinian Communications Relay"
minimap_color = MINIMAP_AREA_LZ
//telecomms areas - caves
/area/shiva/caves/telecomm
- name = "Shiva's Snowball - Communications Relay"
+ name = "Communications Relay"
icon_state = "ass_line"
is_resin_allowed = FALSE
/area/shiva/caves/telecomm/lz2_south
- name = "Shiva's Snowball - Backup Communications Relay"
+ name = "Backup Communications Relay"
minimap_color = MINIMAP_AREA_LZ
//exterior areas
/area/shiva/exterior/lz1_valley
- name = "Shiva's Snowball - Landing Valley"
+ name = "Landing Valley"
icon_state = "landing_valley"
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior/lz2_fortress
- name = "Shiva's Snowball - Landing Bulwark"
+ name = "Landing Bulwark"
icon_state = "lz2_fortress"
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
/area/shiva/exterior/valley
- name = "Shiva's Snowball - Storage Bunker Valley"
+ name = "Storage Bunker Valley"
icon_state = "junkyard1"
/area/shiva/exterior/cp_colony_grounds
- name = "Shiva's Snowball - Colony Grounds"
+ name = "Colony Grounds"
icon_state = "junkyard2"
/area/shiva/exterior/junkyard
- name = "Shiva's Snowball - Junkyard"
+ name = "Junkyard"
icon_state = "junkyard0"
/area/shiva/exterior/junkyard/fortbiceps
- name = "Shiva's Snowball - Fort Biceps"
+ name = "Fort Biceps"
icon_state = "junkyard1"
/area/shiva/exterior/junkyard/cp_bar
- name = "Shiva's Snowball - Bar Grounds"
+ name = "Bar Grounds"
icon_state = "bar0"
/area/shiva/exterior/cp_s_research
- name = "Shiva's Snowball - Research Hab Exterior"
+ name = "Research Hab Exterior"
icon_state = "junkyard1"
/area/shiva/exterior/cp_lz2
- name = "Shiva's Snowball - North Colony Grounds"
+ name = "North Colony Grounds"
icon_state = "junkyard3"
/area/shiva/exterior/research_alley
- name = "Shiva's Snowball - South Research Alley"
+ name = "South Research Alley"
icon_state = "junkyard2"
minimap_color = MINIMAP_AREA_RESEARCH
@@ -157,108 +157,108 @@
//interior areas
/area/shiva/interior/caves
- name = "Shiva's Snowball - Caves"
+ name = "Caves"
icon_state = "caves0"
ceiling = CEILING_UNDERGROUND_BLOCK_CAS
/area/shiva/interior/caves/right_spiders
- name = "Shiva's Snowball - Forgotten Passage"
+ name = "Forgotten Passage"
icon_state = "caves1"
/area/shiva/interior/caves/left_spiders
- name = "Shiva's Snowball - Crevice Passage"
+ name = "Crevice Passage"
icon_state = "caves2"
/area/shiva/interior/caves/s_lz2
- name = "Shiva's Snowball - South LZ2 Caves"
+ name = "South LZ2 Caves"
icon_state = "caves3"
minimap_color = MINIMAP_AREA_LZ
/area/shiva/interior/caves/cp_camp
- name = "Shiva's Snowball - Cave Camp"
+ name = "Cave Camp"
icon_state = "bar3"
/area/shiva/interior/caves/research_caves
- name = "Shiva's Snowball - South Research Hab Caves"
+ name = "South Research Hab Caves"
icon_state = "caves2"
minimap_color = MINIMAP_AREA_RESEARCH_CAVE
/area/shiva/interior/caves/medseceng_caves
- name = "Shiva's Snowball - South Med-Sec-Eng Complex Caves"
+ name = "South Med-Sec-Eng Complex Caves"
icon_state = "caves3"
/area/shiva/interior/colony
- name = "Shiva's Snowball - Colony MegaStruct(TM)"
+ name = "Colony MegaStruct(TM)"
icon_state = "res0"
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
/area/shiva/interior/colony/botany
- name = "Shiva's Snowball - MegaStruct(TM) Botanical Dorms"
+ name = "MegaStruct(TM) Botanical Dorms"
icon_state = "res1"
minimap_color = MINIMAP_AREA_RESEARCH
/area/shiva/interior/colony/s_admin
- name = "Shiva's Snowball - MegaStruct(TM) Crisis Center"
+ name = "MegaStruct(TM) Crisis Center"
icon_state = "res2"
/area/shiva/interior/colony/n_admin
- name = "Shiva's Snowball - MegaStruct(TM) Administration"
+ name = "MegaStruct(TM) Administration"
icon_state = "res3"
minimap_color = MINIMAP_AREA_COMMAND
/area/shiva/interior/colony/central
- name = "Shiva's Snowball - MegaStruct(TM) Residential Life"
+ name = "MegaStruct(TM) Residential Life"
icon_state = "res4"
/area/shiva/interior/colony/research_hab
- name = "Shiva's Snowball - Research Hab Interior"
+ name = "Research Hab Interior"
icon_state = "res2"
/area/shiva/interior/colony/medseceng
- name = "Shiva's Snowball - Colony MegaStruct(TM) Med-Sec-Eng Segment"
+ name = "Colony MegaStruct(TM) Med-Sec-Eng Segment"
icon_state = "res0"
/area/shiva/interior/colony/deck
- name = "Shiva's Snowball - Colony MegaStruct(TM) Open Deck"
+ name = "Colony MegaStruct(TM) Open Deck"
icon_state = "res1"
ceiling = CEILING_GLASS
/area/shiva/interior/aerodrome
- name = "Shiva's Snowball - Aerodrome"
+ name = "Aerodrome"
icon_state = "hangars0"
/area/shiva/interior/bar
- name = "Shiva's Snowball - Anti-Freeze Bar"
+ name = "Anti-Freeze Bar"
icon_state = "hangars0"
/area/shiva/interior/fort_biceps
- name = "Shiva's Snowball - Fort Biceps Interior"
+ name = "Fort Biceps Interior"
icon_state = "hangars0"
/area/shiva/interior/warehouse
- name = "Shiva's Snowball - Blue Warehouse"
+ name = "Blue Warehouse"
icon_state = "hangars1"
/area/shiva/interior/valley_huts
- name = "Shiva's Snowball - Valley Bunker 1"
+ name = "Valley Bunker 1"
icon_state = "hangars1"
/area/shiva/interior/valley_huts/no2
- name = "Shiva's Snowball - Valley Bunker 2"
+ name = "Valley Bunker 2"
icon_state = "hangars2"
/area/shiva/interior/valley_huts/disposals
- name = "Shiva's Snowball - Valley Disposals"
+ name = "Valley Disposals"
icon_state = "hangars3"
/area/shiva/interior/warehouse/caves
- name = "Shiva's Snowball - Blue Warehouse Ice Cave"
+ name = "Blue Warehouse Ice Cave"
icon_state = "caves1"
/area/shiva/interior/garage
- name = "Shiva's Snowball - Cargo Tug Repair Station"
+ name = "Cargo Tug Repair Station"
icon_state = "hangars2"
/area/shiva/interior/lz2_habs
- name = "Shiva's Snowball - Argentinian Research Headquarters"
+ name = "Argentinian Research Headquarters"
icon_state = "bar1"
diff --git a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
index 9fe36dec66..7ef6e8cae0 100644
--- a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
+++ b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
@@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
/datum/job/marine/medic/ai = JOB_SQUAD_MEDIC,\
/datum/job/marine/tl/ai = JOB_SQUAD_TEAM_LEADER,
/datum/job/marine/smartgunner/ai = JOB_SQUAD_SMARTGUN,\
- /datum/job/marine/standard/ai = JOB_SQUAD_MARINE), \
+ /datum/job/marine/standard/ai = JOB_SQUAD_MARINE, /datum/job/civilian/synthetic/ai = JOB_SYNTH, /datum/job/civilian/liaison/ai = JOB_CORPORATE_LIAISON), \
/datum/squad/marine/upp = list(/datum/job/command/bridge/ai/upp = JOB_SO,\
/datum/job/marine/leader/ai/upp = JOB_SQUAD_LEADER,\
/datum/job/marine/medic/ai/upp = JOB_SQUAD_MEDIC,\
diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm
index cbbb871249..bc1520a246 100644
--- a/code/game/jobs/job/civilians/other/liaison.dm
+++ b/code/game/jobs/job/civilians/other/liaison.dm
@@ -23,6 +23,13 @@
icon_state = "cl_spawn"
job = /datum/job/civilian/liaison
+/datum/job/civilian/liaison/ai
+ gear_preset = /datum/equipment_preset/uscm_ship/liaison/ai
+ entry_message_body = "You are a , assigned to USS Stalwart by Weyland-Yutani's Operations Director Joseph Johnson to protect Company interests during marine deployment. And these damn fools made you work in a cleaning supplies closet... You will receive your mission via fax."
+
+/obj/effect/landmark/start/liaison/ai
+ job = /datum/job/civilian/liaison/ai
+
AddTimelock(/datum/job/civilian/liaison, list(
JOB_HUMAN_ROLES = 10 HOURS,
))
diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm
index 70060fb36a..c33130361e 100644
--- a/code/game/jobs/job/civilians/support/synthetic.dm
+++ b/code/game/jobs/job/civilians/support/synthetic.dm
@@ -46,7 +46,16 @@
total_positions_so_far = positions
return positions
+/datum/job/civilian/synthetic/ai
+ total_positions = 1
+ allow_additional = 0
+ scaled = 0
+
+
/obj/effect/landmark/start/synthetic
name = JOB_SYNTH
icon_state = "syn_spawn"
job = /datum/job/civilian/synthetic
+
+/obj/effect/landmark/start/synthetic/ai
+ job = /datum/job/civilian/synthetic/ai
diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
index 8e4e7c0cfa..7522b6b535 100644
--- a/code/game/jobs/job/command/cic/staffofficer.dm
+++ b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -9,8 +9,8 @@
allow_additional = 1
scaled = FALSE
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
- gear_preset = /datum/equipment_preset/uscm_ship/so
- gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/lesser_rank
+ gear_preset = /datum/equipment_preset/uscm_ship/so/ai
+ gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/ai/lesser_rank
entry_message_body = "Your job is to conduct the briefing for the platoon, monitor the operation, and listen to your superior officers. You are in charge of the platoon for the current operation and supported by your Company Command.
They will give your orders VIA the telephone in your office once they are ready.
You remember that you've stored your personal gear are located in your personal quarters.
Your job involves heavy roleplay and requires you to behave like an officer and to stay in character at all times."
job_options = list(FIRST_LT_VARIANT = "1stLt", SECOND_LT_VARIANT = "2ndLt")
diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm
index 27fb293daa..04b9913ab6 100644
--- a/code/game/jobs/job/marine/squads.dm
+++ b/code/game/jobs/job/marine/squads.dm
@@ -123,11 +123,11 @@
/datum/squad/marine/alpha
name = SQUAD_MARINE_1
- equipment_color = "#4148c8"
- chat_color = "#828cff"
+ equipment_color = "#808080"
+ chat_color = "#696969"
access = list(ACCESS_MARINE_ALPHA)
radio_freq = ALPHA_FREQ
- minimap_color = MINIMAP_SQUAD_ALPHA
+ minimap_color = "#696969"
use_stripe_overlay = FALSE
usable = TRUE
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 2e79604e87..345a15f66a 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -316,3 +316,9 @@
/obj/structure/machinery/door/morgue
icon = 'icons/obj/structures/doors/doormorgue.dmi'
+
+/obj/structure/machinery/door/proc/open_or_close()
+ if(density)
+ open()
+ else
+ close()
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
index 42aa2e13b8..b68f148f3e 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -145,8 +145,8 @@
list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR),
- list("Solar Devils Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/devils, VENDOR_ITEM_REGULAR),
list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR),
+ list("USCM The First Patch", round(scale * 15), /obj/item/clothing/accessory/patch/thefirst, VENDOR_ITEM_REGULAR),
list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
)
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index da6d4f1a82..9b1d720d09 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -14,6 +14,7 @@
var/is_watching = 0
var/obj/structure/machinery/camera/cam
var/busy = FALSE //Ladders are wonderful creatures, only one person can use it at a time
+ var/update_sprite = TRUE
/obj/structure/ladder/Initialize(mapload, ...)
. = ..()
@@ -55,6 +56,8 @@
. = ..()
/obj/structure/ladder/update_icon()
+ if(!update_sprite)
+ return
if(up && down)
icon_state = "ladder11"
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 2e3a536536..be8dfd6a23 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -1314,12 +1314,14 @@ var/datum/controller/supply/supply_controller = new()
return
/datum/vehicle_order/tank
- name = "M34A2 Longstreet Light Tank"
- ordered_vehicle = /obj/effect/vehicle_spawner/tank/decrepit
+ name = "M34A3-C Longstreet Command Tank"
+ ordered_vehicle = /obj/effect/vehicle_spawner/tank/fixed/custom
-/datum/vehicle_order/tank/has_vehicle_lock()
- return
+/datum/vehicle_order/apc
+ name = "M577A3 Armored Personnel Carrier"
+ ordered_vehicle = /obj/effect/vehicle_spawner/apc_movie/fixed/custom
+/*
/datum/vehicle_order/tank/broken
name = "Smashed M34A2 Longstreet Light Tank"
ordered_vehicle = /obj/effect/vehicle_spawner/tank/hull/broken
@@ -1343,14 +1345,13 @@ var/datum/controller/supply/supply_controller = new()
/datum/vehicle_order/apc/empty
name = "Barebones M577 Armored Personal Carrier"
ordered_vehicle = /obj/effect/vehicle_spawner/apc/unarmed/broken
-
+*/
/obj/structure/machinery/computer/supplycomp/vehicle/Initialize()
. = ..()
vehicles = list(
new /datum/vehicle_order/apc(),
- new /datum/vehicle_order/apc/med(),
- new /datum/vehicle_order/apc/cmd(),
+ new /datum/vehicle_order/tank(),
)
if(!VehicleElevatorConsole)
@@ -1365,7 +1366,7 @@ var/datum/controller/supply/supply_controller = new()
return
if(LAZYLEN(allowed_roles) && !allowed_roles.Find(H.job)) //replaced Z-level restriction with role restriction.
- to_chat(H, SPAN_WARNING("This console isn't for you."))
+ to_chat(H, SPAN_WARNING("This console can be accessed by Platoon Commander and Platoon Sergeant."))
return
if(!allowed(H))
@@ -1381,17 +1382,21 @@ var/datum/controller/supply/supply_controller = new()
return
dat += "Platform position: "
- if (SSshuttle.vehicle_elevator.timeLeft())
+ if (SSshuttle.vehicle_elevator.mode != SHUTTLE_IDLE)
dat += "Moving"
else
if(is_mainship_level(SSshuttle.vehicle_elevator.z))
dat += "Raised"
+ if(!spent)
+ dat += "
\[Lower\]"
else
dat += "Lowered"
dat += "
KkuD<-UkMczq~yxm(0bInck?~FdmlIyZdSE7qTXx( z^p`#N_R7;hnvT*GziPQZ`2b@Q)5?3-mqnTibPr%Sj9GvB#2{xvdI#?*z$3vQ_7Hv7dszRUwv_qCw?Efzb zkaLv)S^7>zz8BiArR4$R+_ObMpzm!9I|tLQO3|Lc4_#8f)#PwkFOX(DRHtSS1d_6w zy73vHp)SN^<6K ICZKc3K&oE*^;CA)$5p@@C~k Dt01 zGpyAVxb#!iQu-BF3BJy2!0MMD^n123NYtY~=ESN)o3TT1nR!xqCU<9D_e=cQFyH!W zdgWvPoslU)<+6*b8;XV?5VQQ0PRo-!gDVGZv)D=VL(-;iD=i=uToQcLfa!F (5J+rTVCE_^Ybwk|IeJc?ddJ66J59ufN zRxP>xQ-{4*7ut(O_&hd>%Nu7BZDI 02Fo1cIWX+-3NGVdjf@i2=VX>7 zH*dI=OH4NNf}x#Ldt~3E-64YmH{pa)a2JU%?Mi4{a|`?`(<8F|Vs>n4B`C$(ANfqr!Fh4D39bIcf%`0}Y7oO}i6>ae=E{v)D0zt9&}(=k^5>k~1A z%}2a)taCeE2;5YF4A{ydd9+O2aFu8`%G|6h$C6PKi7RsfMhM+SVOWGs{^UsO%*s(R z9~fGNojnjkxkkc`gLbIB>psTC^kgp;9>L)FV}c=R%F$-WUee-cXOeE(Qxmqf@3Pb< zt_jJ~KX3o|K5c5P)ar?xw&hEo55ouY2>=cn^3?Nw55UktzIn_3W8Zlq3XzgAja!qh zf ja=q6C1xWS67^V`pVXoU=Vs>H+OLQ9%CMKaL}g{ zZ{oU==f3q@=psmVl0q;W ))qPQ%~Ic~sGfym_F7pjCZCP@Ob!X3=l}%z5y}sb z8%Z-ETcM63+gay1ziBr#G!%XP`YqAr{JC@LuC8Uo_3FOZX7JPk9%2LxHRA)#8_Iu; zE+9R?W{T@3S(-Tu$Rg*gMqWV!4>96o6=M2hv&Tc7JZ43y7rsc}_Q6Zl!xB}VE)%1` zyY1>nv#vtk!S?XTl)WVb!H$mQ0Y1L%0CLYQ*iTDfX~+G|IX=EByFPCGd(nUvHe8+D z;d*s{owBl{qhsS#lhuu@SCzcv#qZz$FpKjo6#;JPikk#)$a*CNG~qutI!zPnqsgtM z?;TCo9Oflq$d4EAy;+!z3Y{e-zUsw_^6~MwNelQ!THwqr962mh_Qcf>)>aneHjI~w zGYBO@sRh6+cKk`XtuL}2)3+0pQ^tK?QF-!BN6C`bf@>dTHzRGT9cKAyw|Kau9W6LZ zW#lsYVi;1-Nn*BkD2Z1_j^Z4fdi~gW|tw9NiVb(S?BqwMUK#;bCE#n4rOt z2S7|FRraQ`g>oGx;KIvQE)eJr-=Apg!70EP|2IZv3QTiwL9q93lOUj0cg!W^!6 +&Yyo`or6P_F%hU0NV0O#xb%Qr z^3v?W&gYVH%w(m=iPOy41g3~D61R!%y`1BF?)ezlg}b9YeI`0%Fh|j_h87!(LE>J_ z9kb+T<&m9T@iooR*sSJ}tfE!H_gCURoGH_bD9RK3Maa}RAneN!Gc0Pcr}<7Ye+@O= z&*|GC&Bf79!^_<0dFV6l5xVW?;^cJse$|(xW|TkLfQ5A=&kRWg%uHdNcG$~r%k7)x z;;{>woV&k;2k&$KRz0nLa+H@9cmFgmqgh4Ww?uHSj|=VI^}q*2(bPRF*i@?^G@Uw< zk24>tjWD_M(B;dXxcAoq=Y4e_Go>nN3S0|uSo+J-y3}plmR~^gA_I>xitY-6FL>I@ zG%K<9b1vlth>Sb*n^hg`5n^N3rMu3GfJ?OX?;fr~*p}f;vdk;$6jtRt?pAQwug|n& ztDFs{L=o~_2RGLn90YU^uIY2uZH!OM?aWxsuEjok`#lmbNZ~+-fnMIy3Y*+Lu8u~c zH?U;DRcRB7CQx1>`L^|wiKm?Chf`)<;^@W1mIQ+u>n!9y%O4EYuC@MpWVQo$sanAc zz*ELCO&hZ!(xh@#pCfSO5n|&!EOp^Jf_X1GBT&GouX+ApAwT1i87Sg@PpP1dnx)dX zlk^(L$DWh*mhyv9jWo$Jd(L+n*mDYgb9i@FJQT!JPoLN26+?P-QUw*2vJ`s5&%100 zPb?mEX7n166UV?pq4Gne?~bzFWERZoBup5JTw{2k)@%-Nt|Wi8u8#7&?v^x>ZQDLN zmWf55xXYOrQp|N>=m{n+#YbspSno(I#9epkrv@*kL h$P3x3QwR#Go0-|~}K0A58TV^tsm{y9vjbOJ~3z7G~ zuXC8
YXwqLrXSc zb3Z^1HU-)}6OsQUQ|inOG)jm*zhHTkZT`E|$E-I_hUT+!XPePRfAYn8t3QDu+U(Eh zpG0i`Wl3c _IMJg)zosv_Ku|B;)25=qjv7Kco z_V%3cl_Z5IOOFmT3x268aD)uwkSaz)kvwFRj8~6UoTBL<8DQxA!|d9K4 7 zy%w-wRoP`%Zmd~|6s44Tp=>c3;y!1UCj+U%Yp{n+KZIkK_n9 zz}rxxMJ6~Y_tQ;$Ek)!g0s$x %u}{lsqz!IAwodfA7pR*Y<)wJ&MD@3wWO51_nJ zQuMF;R)^a$6WhcM^M!VDVG>zrOuPQ(O%Q;gW;*1c{BB_04xVX0TEi1VM^P3*#70PN zA5x%NAW(dmM~8>W(r)^*Ue)fwn9b3zsV_HuV@<$Nqo2_{JnW!b&HK;&@FONm0J82) z&D`tMuN8*Jv=4v3Wm=r}>|?;U59!Kd(OYBQUd))XdYzW~OLEFOq-PSxZ5iU%;B6}c z6vMrgltEHir-=%B0E x0Ws&+jyF%Kcg9RAY8o3;Jojce~Cdo~>zy zg!cyVq$N8d*C&z+#n&dw99zqh>>#>v)Ff*S|Dy=NIZ{N!|0og=?8dv|oRz@G SL&eG9Wt2qiQ~H5{&h|JR*~6w3W&J&bT07#OG&9QdvF*a zstMViZNxTZ?Kr4wE-hJsml;AR< _2A>$hWxDyou5Z4<1Qz??az-2C2U$tWrH5I(~{}$~QZF zBA@bHmISyH#ksb{E&1VLkHOVMS(2*c@bJ9XY8<+j2~d_y=6Nq|r~Qi(FXErvb^bKO zuLKZFee{!agUvW^gKMiTpne8rsV|c$zuGW#`W)Fk9t&56b?4Y0&)pjWHZcYP7}2%A zwa~_m$LNglNP6Uih20Yue=i$#S#ofTI55dJ!6V=}Ik6(Uc6S=!G(`mZtx+wL6)QTr zZ`XXkm_+p^00zdftyL&@>?viT&&{lS=0Oj7yfQ4X0DUQP%jXioQW~w55!5rjg$%H% zn|`uqSqm^^(CPN{1Cm=nfI8sFZvf2NP9xWUH$~x&+WD*6XRllMuFE)xyc=3$98KSa zA^{obAT*bWx&FE?`CFcSuVBhnA22e4_|PG~Lzz-HSeZ3CR)Lo{S4D+OPRcTfuz~W} z`f))^Nl9sZVFLw^%m}%IAnOd@BcQCQkIO7_uwU}=sIWkk1~F7yw?$Ph<>=YD)q43a z&l~$ncS&;iZLo?mxz)x0i}+S?RK}T0@iSoMN$}e&dDjo=RDKHwV~P*II{;|&N&9qV z=CNmIsx5-Wn5~c6TStS#0_3RYHXGvs{!(0DCJ};t&;3cemu78Gc`r0PWmJyG`lZNY zN5>+W8v7Uu8)W54?&H~ks8wQZZS7!xKeM@i77u=vIW7wiT<^2j02KKqhVClu`i%nu zdl8~7FX2ZLk8w6N&Gia;fTAT@k`^oNx@+L yGb#= z@}EtqZHkQj@mF>I*0id%Yt+WZ@~KLrUGeRlJUnL*2kt~W1#sZ(G^BN(e;i;OcQyi} zqpj_IbcWdpiXgQR?Xv>?u>)VM-abdHgmE2CFPu0XyqI@^*NGBQFurpg!xhNtAa9IU zRA`3R!~0ZJRJtIuk n6#?Z?8)qnTSwJd_kNMo{N4-|_!G-R zhWUWHOTYAgTBH3}YuNu@Zi-)ByAW^EV+_?Nc2#A_tqqhL&D=3bJ6+dR^g~OA3tGxG zUFKH1NG{b2vLH7q*HJuQ61&x{YNWnniI1LM%$buXs{D4AANNoU!tk)6A8|FG%Pn*Y zUmEy|ptRN|8>*sgv#@p;Iht H1mVBq27OSTI%Tl_ZLW~HUA?c$GmeEe-=EXR2n zE41xB#9dD?)?FgF8mMvT-m$V!wo&*g9~lyT!=Sk|9l8g@j$+mqe1 ;Gu{qk)JY+IRILCgE7LQyq|KigtQB`lkv*qcDz zYRWEA3UcI~_G?HdA@QexpjO&70OjRr88z9xopzncc1ejoy&DcUR3{%lk |V3kltGoQ$@d+jcgXNv-Ek59%5cHs!kZ9 zeo3J|-?&iQPH!S&geQdiDs?zrqr4muGnMJ{`L+yh{V}uHz)DK`p02ju_VFoto8Oo0 zI_7lcV$Ng87m4*l`Fwy&+{I=Hy$uO8YX-X~9C<9!d)Sj_`I%2YFuPw=XbUSIO$_t^ zqOacMx3;sdud1#sf00y(B4U MI;$*e-NjPiO!huOv-MbkMd_1ii0vfDAbC0jQ>3=m|Grj zG}>FCcH9^zg!^0^vb-1;)^UL*FI1MXr!%HYdYMC;JbFBXbjyfgwkfsE>MJ$3h*Ad( z+4>~uLW6b7iDXHq#OcbXuPI{ 0(kpnM2y@T| %lilMbvWK$W$IBxf#QUJtL)rh|5l^g3v>zmrZ?F88*|e&=RmoS4p~y$1w6O zK+HN?podEN{9kftr?N?n{YZJ9j(E!MlH7KEZEr`dGvz05cq$0r5;3qUmso3WvMN89 zl<0jxa7#K7W`%JF*mXg>@xi(tawCVW#rTp;85Y%N7n<72O&i_q(G*zomz5ScoGt>e zx{D7vT%v~(HOxl(+PL#)ULtp~^53?I)J@bX%8N ?sP4f?5HhN;?YtD6YNeWO_yeGSF&U4{tx#IFx(EKZ``T!-U7=kjI;xYb3 z(;ib?Yljjhg%+-GC1ApFdTMR^Y)45%Giok7j+nEXKrHq4pePcI*jCXF41VgieVz$| zIXVI~T$Jy{2)A3D(Bnx9l$e?HP>$MX(&{y{UL4Q#wVjw;p?vbMl-%+79yGr1tl-qm zazGsaRnb0UI;5#fh7r&?_AP?j1NY(%aWAwLq-ThQy8ur6$APP31VhOgq62` #o0o|G2up5pla3T$&JgY>+LN z@|o%&$2I?C^hmeEjM&oe8LrHBz;8o!d6w*t?Xd%gF3-uRqGa{yvkJ1$5GuO%S0SN$ zI_+L6NiP(PMXcrrB6#ppCy)0Bz_UI_XFeH4B)!^gq(w0vqklpb0B;h|n )(Cu)}78Zf}J`RQ_+fX-c(9lf|W9`yUc0%5-YcmN<*QL!&) zD%C(OaOXH$uH2%!CHsP$s(+2umHBsjYvw%K9@))PhiAiTdfx0GlU#cO!@^z#$bplP z1x=21RWrVAy9%aO;uZ{j($c#D04095srh3Y?4qg(w)HEOq48nxLz&ujp9C?l$LNFC zM1hHlBUft|cX(iqgV=_V9iywoSp-^ehs&kCiAT0Xd3x3k)TttRH}d|@9069^id*aH zm_Ne{3SQJVd>N@pN#AX3yMPpm_0|#l`6t=wGrQ8+SdZ)%ZmqLGE!V36C_Yd^&84n^ z209?nSAL;=RCMnAlLd6{{wNkn{QlMvNU{XG@es>qHX#siLk=E$709`lg2|t!v>i-P zE#?{+%+aU1XU~kTzq{<{=-y=IrV14BywHtwNu36wWFsKvtVhKc?5<{F1fDG0r#)Of zUTSb5H!k4$+i1KuC(vhsv*!NH#<#T|Kwbm{ZUU6(J*=Y&-`5x@qzYRCN;i}Ofxho; zlKe;Z2p~dl0AfTSUQGn<*`BUrT3W8c6=jr@c*YL11Su6isa;Aj0SIn=hQ+TbZ}xjx zcrj1tjqwg$E`hbrUL=x%A_FB@JI%AT0Mxq`^8c2rXL_@TGb?*-_G9l3 vXsKCDp%iI{wch3x!`zR=A?5bn41&2TcKN3lV9f(`1F%RD+{d|9&2{Jj zaMAqW-I1BGac$T`vY454%p`D3zqq`d=(RiT5Qs!hWAN<$h#4cRa@aVIkd#`Iv7Y!y z*pN#Wr-48GzN2!uH}=8%TMtJpm)r3zimhvCXj|eT?}t{VU@PmcNch$RMz7G@$=Lsi zGi&e+PLsuKs>QSY;F#piSJi9Nqn^>%bhNrtSFeXORc?MJ6`Y&yp&8nzJseb3ugriQ z1Ml&;tr{QK>$WT|GhQek69(Wf+?p|x+8rKVPx$%MdT{*JFH`Iu+6Ne)XJL7v2zpSM zmzQ_6)1vF)>8S zIvBf9ql*Z+`$KYn7K2N> iDtEC?C1|#5Y>184T_RJ=M$aqd55mD{GbR?g zREF0(Iu~LzBm&KJeBoE )s z3%0onV9^)%gTF{RU%s(BYSKO9O=TICd)zEew`&qG7fV0a)%*!ZVFW8)OGaMEoE>KC zYnVEk?0WVmWXldv^KATaAaa *PzbE4k;Keqb)fSHSreS2{^>Vw=>gK2L?@i&zwT;i()8qx5>|eOuUeu+ zVl-;lKxcKcA)MGqCh)l3vC3HJ+tLNjlrSh{F^_RitR;?QnYQyo)L&USQN&`ou%yJW zJ5j{5R`hohuv*uOFr##@9Jo?&5~Fj+NRWMWlT8;sFL%oGxUn{!vY=JjXBNj`JXt5a zM1sOqJZ6+bmiO-{%Yrd9Drk2_;N=lYlC%=A)tyeuE_$9zF4$&y=e)nyW|*Bo-jtJq zK*^I0zpDE0`{()r0qMf}f?dNezXUYfy^#NMkOXkIEJ+lo8jX9(9<~%-yjJ|m&eqxT zo#Xt4%v7XvEd`}r$rXT@mWL_@w0uKiAne?J>W?i6Q3(kXm&qCpK-1|sHPka)E1O?z z?`pYOYk?X9QRWnJ?D{UM7*{Km)dx?NBj1`QiO#8C4yt}Y+TbFmq;TjyeE52Jc=-13 zYd4%uUkUJHN}BtrfjsoW9KqG+8I(KU0q22yZJ~1fY<`Y3h@?J~b&bA0!2mBds%tvL zX;> ^5 zSz5l$z97wv%1E6=m$6USw@VrMHECzmmlw#Cn{}MKU)BU}*0WlME(CozJ0Ul|>H)eu zj0Nd)*(Wv)-; nnLxX+osih 3LZwWkES zLg)5jT;%3<+OUtZ^Y+KM0H>-F$cwn?)-B(qed>y&Kixqg+%3psy4tm5ZIABg4Bhda z!02g7y<>~z8~TuLTx5-V&(&Fdvi-iDA|c%Jxg<&I *_Qh?(bw!t)vc6AGZn*L@IM5!esNQ5sP$ytX_JyDzB73Hly- z=})8De|!5)z1&uSULZ*-my83nX5EPq1X8E5Os5){Yg-ZC`+SB6my}r4D=+N+U}9$b zy~W63Zf;S)+$i^mpg`KV-gBqfaRg#U08j;Blm(~)TUN$8>40-qLjKC0upR -(x&Ph739%4c{dWIm@rNl|f%^&hJ=A}+qdyHO{mbO4;_(l|Z)YZ%5*gJcB zeHK&qezcd<`G4=! rrA+5j=?h73$vC;fH~ z&(B~DWavPGp>InXot{KX^;EBwxu*vqi8N|;mKGM62KcO`zJ )#VRV%Q|qS8|QNvFW1+s9r9Yxy!@ zGr~KODPrgD<%R&f0bM0HeC>6Wr%azrKZl9DA0>`%=9LdhdyWEnY|v5fGAJEb2;C&= zuvoD40Kk|}%8dbMfG*sx@c-^3-+$*g`3?69Pq}QK6eRu8^t3O`k-R;C2b@ah_a3Nk zu@AznY7Omo*WGg#TY#nb%6ot_ FS )Au%wtS? zm`+~MLZu_>@nsexJ3#>&q>61OkIr{m>yFRMJvXt@OCJ&CnyY^KU31Y)a1_wREM@Bt zYVbL#O(&P^>-v$};$4w!LH2V>=_~S&VkmQzADfEZ+P^)cUW%Jruq8FZY&uT0O}hfT zNPGTQYs!CZ-288N_`g#GWR5!pL*=bO<3=Kvsts$RXHDg_Mh*pvfmwF^f-IuhNDce) z?ToLW(@oOW2_sx;$@1(yX~(n!i5_EobEo50^o0k5j4+Ia_b{Ub8tPl63UH6(VD)WL zQ qE&5 zpF|!Iv!fxC{uJRL*lhU1J|68p6vwKOKOJ%h+|DFITU=m;4DtsO6VNpmx{ EAgWkB z0NF+-qePizM+ZgHC(7nUZkETj9Q5(q96}l)vo`qZ*|RaBL6z689Qu;9t4ElcJwGkr zK2gA01s&txVP}DhybqR=2nEc4wP{q+{L@C^|H7c{@38bgX<3F&yMlt#pA9Z*2=U9R zywQF*aWwrx*RDL
jAuefm_ncXsS8lPqXF|1*p@G3;8iu_tQSQKB19kP6K$;O}j7CA_Hg>ie z_;keJD;ZwxmajSaIqIrN!%ogSPaH98IU8Z%Q5o#|7Sem~vXSq1(M!krww*=i%ecuC zOG8ErTfsIAn_Ws;Ut~!-CxcDTvnL7Rez(MWzo=WEuoP+eDL{8$LPOKMF~=sSJ1oXe z-}kHW5guO^h)Vf9#q0^vICoVZ`d9?vja;~rUu=~kZPEj=FIbnu*S&MR0HKwj{-(XN za@~@!reV@aD_yMQ(qG%hl^_^2eWX~xrNi)ZwC<)w H`;&Nu&xxA2Qm zrn0h^Hi{;nFx3NkiCLG_982>WNvNuZm=rKH?iDn7+U(GahD^>4KXrELjx`dNsqW4% zu8AiNUUp_-ahLh@>sChD{{T@4Vvdm9Sr)b=6uD`~t`U4gCciqZq)BL6?H?~cmgctD zefh`*t>>fwm;$4T5+>GL0byYQ#{+7zw$*Z<0A4QnSoFjHuq0^Op6)*F(zKr6T|T#W zIr;hT-bZ_?EolIluS9c-Nc3b_PZ6F1tgZ@4HvvPm>)fEC>z=^7t`&4u+`;ioSNfW4 zY(g6U``q_+ pE0cA`>m_rp7`BvlML^ zWJM8s7bdm?_qS%ZN&ee|PC+q07pMwns!gh@t8!{ONDJj{p&M@jSs0;^v8RQdA~*t; z-nQ3yA3XCp@Dg7w66SaNz8Tlr4v_ttv~c%m^VssQ)N)nu1D!XoUvx^l#eck*EO_J6 z>a)44xF$W;v-i5u^zEHr{C2R12cox(M*DXrGr+NgnMsa4NgSfq$m(!Mi`CgVRu*2& zkNM?% A-IaMXuA{;nHWcDVr}tsS{%x1CT}yr~8dwWzq1{!}nU zSt@ECPl&VWn^*|)@wMcAy&PL-zys9h2ZsTbsyWBPA_?fu?-emV;ttk^frn?kgt2%4 z_^okLYQg}a#yE1|QeMhcwA0Nafn=Wa)rL_xnprmqfHXHOxFzN0WeN)WvUFWU$gtMi zI}`Lt;(2{M`*|Vw3q?oF d)K@IiPd( z6(DBGZavc{MQe=1At%036b=}yr_dEjKNbddx-76Yre(3Oq3x7PrJ>En!V(09PJMi& z3PJB!4`iP>{plkgwSrBBDe?s(pF$!o&>1ayBM4-wFeESU>)EdD4|uQ8k*_UQba}K& z)SeK?htez8?*`b|+G$w2q?L+Gu{AXRgqYvF`)>TkU63+Ogt%@w;m^jY6&&<3yU AB%!mTh>cAwsYI$^}QVpno<|%x66`u}l=M$h8 zfd0JupMU{-5}P*Sb5vbj)oKL`bOqFGBc90sVdr)|;2y0-4y4cOD!r9-6$L=!)j*0; zrMwl FPxTc+1wC#Q=XNtTo|^om;CUV7mEWAcdRmq&6OfaWr!ks5!N&)f zTAy*uXrFecI >ZJP9?!>ZPidAI0M3Xh}wi)l#s71?Q03KuElG`OsSn=vK%1XT( zcL0odI)Ab8E50^`dysxuptkSo*Jo=OsjRlp8Tl#t?;0?*P-f}UfPg}~r3Ee7m}k5k zvS zJL}vzrPW-JuOpe?q=e^B%2r#W1fgr4m04+FGRN6U>Lu+(Vxzu YV2&WVI!GuW~!=_G;)aRqdvZ|eXx>;iz&cVKpqb-YL z-U(^>eyj)|JL-U@>hoOTzOou6U^UQcZlWl7W1`+&2}aWv$tm&bG*9K9(INb5Wtn${ zr}n#a@37D`F)BWnw}`YU&kxNKA5hONF;7=gPRnALnWXJbC{NP(OT$*qLEX;5e?U|s z(g>gdjK(~1vTv-^E2Q{oFn3n9@Xht+6KzuHcBz7&JK~l0Zcly1;+2cBHjmfV&(Oom zzf~|2D;bNn0<>>Va*m_U@((ylUy9%E zU1O9dzfBu?Ced1D4gLPLWv2gY(U`w-_Sk#$*W30LFnDfu)r|eGMgIB$<+6vBhXVGa zcm`N+dbW=-Zf$eN*BEyO&XUN5xmrc@O6hHp6^ O$6A#Zi!56cVp$Eg;$wDd55I z0VVOU+Umz$yO{u^V^S}pJd${v_DtdmX2a+
tqRYE&@x3i90CtH(Fw`Q zs<@`etNnmTDb0ScoK2rDD}L%#(T_zt3n+@J*J3;jV}dMMO9-Oo(gND)IbTTDuVTb^ zmwKggCN4GICFXXOR<9J8>e`_#Dlt=WQ{Lx4GO{;vrS&MIPZj!DMhR_~YrVmfRGiuu zJLBSqg3gLog)~o_h2E2XYoe*z_$yfg{MXWm`JZM&quo!X;{Xl1Zi@C%o+_(_LLRQA zqqvaIfPVRt>h{DgHkMT{*$`5Fnn?~iHPHJ#{^t{)0V@0cr*79znknfnm7Ga<{#4Ii z6QVi(D704OEsehm_%N$nh9yR4%o-g%<)`wYdDX SXI-H49xCJ`?4=MO suX5b;^^!Drl+N1s#37kwjl<34rkk4 ziFSTk?f-jdYUnLOJU}^}rZR*XVLGz02Ux^b*Y@<&NlU7GdQC|p?OD}Sa_J!E?!8^- z58?sn+pLZAKUfuapBn)MUPuMSJPON~&|krFeD&sn7UgGS%`hr6mBa4 +ta*9Zwvre-ws-3k Vch{)An7+W}%0 zhEoU67z2*4Dunqs2;-z<$zCk#=YrG!o%eJz2WgCXw~{`!o_u*}-$GQWu9yjMb0v+e zpy!z|Bf!6vT)B4c!Oe1SysG_4X5JPv>R>#+ jm<3 z9Bt 6vfw6ChiB zl9{=-EV^AHqvo*2wE*jQ`M2_Md9Bd gBEzWpZ!?S#=UYBbIW}=Ts-u^zH(EvHJGd@;0b;NM@wq3mpWcI`# zpas_pAHSt#NSI!q+ukU{vf9fDwVzO1su>>Q7sq-X%uB9lX=AMlJKoaVd4-Xh>|LcU2ceqnq+Xf9a6iSK&_jaHuFuE z=#Po*-bIRic>!YN=YCH+hqfoS*vE8{0X|LqHDEqgLNk?l5_Ja n4e)a+y-+&S#4@Fe%Uz`*LB6_dxs1q zA8Fb=?1_5+=>w--VR5r~A!>32hx5Ajj*>BVy(pq5St}OIeETw&Wyj-n+%eV%aCwH* z-5qr*lfFHQ9{*Y#gqC|L^zK&)@paW+kPQ}A=i>e6ZXr#fVSa0}tfAZH*UZ1&jeOO6 zu>G@+?0NIF AGQlpgL93ge;g*->9VmYR6F-<~f*ch&;ZUfps z_9S}_-c-|=cw_`8DADb6+Kfe&dh~vF*Vn&qFmWD4kyT1QL?hXxdu=3j;{N77=QTj$ zfPARQt^8!_ 4KeB#EYbHXFtpUWcDh0A_&&*dGXa6u9gOUKLk5 z(WAx>d?+hZMB4gwokEuUtWL~aoB35hpdB3vU2u4v7Ai9u$iYUqh^C{i5TP1eifcC@ zAq=%6J ;Fr3;sICFYNm{Z9;7N0V%%Kzv``IC}yxi0Gegw!Gjb>WjD!H&6 zn4GROumOdgWp^@>pSuAl^g1Jm-&V{B&|nHGfJ%#nr16gqaT!y4hG>126uWmjA0p<$ z@GxfXs{j6kK0r$gCocgHXe7SI)aE~c36GWS{@Ee5f{Mm_O>JpQ4(dpXDx19x38$n{ zzaJ{`i*J_WA_1-a3z&p|{qXQcZLO*u-`JR`ZiGq*GbmhiSvqrL!jkI@Pm6-*l(QNX z0h|&HlmJ^ MIV9#2#txd~bRH`UZ1wzEQ4NR;5(J{}p!_euwcl>` zsT^dP|41QVkKlGp@)p43TCefmn3X(;7~DYa7hu7Z<|tJ5!HzrHv^c4aQb4_$ovE8B zT+RkI+Sb2%N&2sBin2c&1`dJO%h`h$?a!VH-WVPe<4R%Vxm0*5HdXe?e}Fbe@-$*l zmQzY|*?0P{<2EK;DS(a3ELSN8Yz9?Jp^Lr&T*3=NqcD#dEFJgWH$B+bkDf9?ny&7l znV;tivXg)90Or!~KhIT;*Ty1bkwpA+U7L$xs!YVu^3_{h_Z~ql)x7rm5AFP4KcIj+ z@zpL&G8o7Z73Y+Yb%7`j-DmC&u$d)qwZ&B)F2xdzQezu&W2SNW>($Y|YX47ly*}vI z#-S%LC1Gs4zoNV|b_)gDKlt!%??y9TspKy1HJwGNNn_7P{wsOTnP7P1aXT7FU9t9R z(FLdp5N^2SZD%<~NLqL28U))*^D6%Z*P}p7lL^0+e8CZ#e&`+APw^kUre3grIp^%` zaqaW>#?h8uaTdtvm9p|$cL4=u#iT<4DX2r$|C)Wk?M_Tu9DT9p8&jlGe_| qqFU%vB_eheWFF;0(5T&mxCL))fL5ei{--T~e}ET-zZ zfYJNrpHX-gKzTxGj1V(dIS{v$Y2Uw=Y=c`!2|)$*W8%i1er9i=`7wE4+H_1}+R8g0 z;(u5NWHDIm)FR*r$oOOXHey)ITcDNqe*yr8J}@ssqD~H !~-1 zM9vpiJv%_rRqspb_kOwuU_N8=rQ{jIWf*Bp2}SaYIFRE7+H zULV_d*=P}*bP{tMF&g#eO<~une8>eeCGdtb;%bSd{*X@6RPl!4Kf1Z;vJv=H4kg`b z7RyzTJZ|6Qb3%8gmHNIr^<{J5&_a3f3@mj{O8QOc=u+|1rnj`AI_;*q-jrY@H%AhA z{T{!FtaD!5Bs)-deZB&uUgXAY<(!?>7Z~lY>*k+|+=wIRM>#zwRA|2fByV%2D(?Xt zlct7mASG>iG5$zx5sSuJ{o|ws2q8Fp=wD$e&UQ#Y4eal3zP9>Ij4K9~y&`mR+-35k zzY#!VNla73w5ukZ+hXU#q;G}UPw 68+i8a1PV|DTx*ll)ZWkTfb27v>0yI-%fiKq)RO$E3>2T(P?Z J zr4bV=jL*feA7(3-*O2vO|9L!Q=>j20w^s_6 Wt%MT$D(d@{Ul1fQhtc?PrAeb?>b&FRH^h9-rpcx2++3&OX2SU#=4 z(|(u?!*hl!kjf$~) At)D+(nn71QI(I$$YaOB{NE7Xz|J@8KQo? zek=k!LyUV`{V3JF`~yt1@tlGbrL_9Adgt|bWd;#*kUg%838SbEr?IzG%UD~r_aBAC z_}&!1LJ4%^{@F$S0X5iYyyP!s23`&>W!7-cD;>Rofb~UdS>e~!a-Mn)X#|yy(xpns zuK?P&t+DcDclI^i{reMpwA++q2yny@3&0g8h`)PxB6LYS|5n6EQd6Dpjh7XLbAJ*j zO4NVmOkTQ|Oi9v}sS(;3DqdqBS`ec2L+lw_tUt!#K~G`#b3A`J*78ii&6m4>Zkm;W zckZO!I3>u%gt6^#wc tmThH9+lOgCsxa3#c*C$_Q~^V_N(db1ogGKv$-c#=x4x z)X%4Rup@)=q2ar<+aRyrKYyPA9Js3AMUkw%Kp>DM@Mz&b{ui8o<8bR!f67Xqfh#Oi z_=~gK&XJ#xfBV^yA>hc|7+hEiwFU}bsld0cnLA29hIE0GF1q3olcG8 1jLS;h*3Uw5Jl;)>hASX%!vmoDXWJ%d^s$Sv)8{y|Fx z#1NGHz&$JFf&24Tt2nIc6l;V0y0KsTliJPXTsk;1!S|Q=%zX*R6Tw`NM}IEu>g!8d z$q15rCK|pCLFhkz{2Lwol;JWzKfi|9z9I1J1OxnK{IoZ= Q1L#po8PFraD?vMB)hg-r-zo^ZGnqZ080M~E21co!MA7BpFxaiqju1z-HU z;bSmKLEe$v486PFsuxA`E>lvnDri |Mqi^>;&e zM)y9SrUnxSlX9LD&vyR$6)$Ka&o69pGbx-+ut*tA&sLJpn|QpdH%6G4 }%mOKKlW467mS_mMa`K}ohT!v<$Qf6AmHSOpqzGD 8 kyV cV$>;W;!l?s&yKZni0U<;70L;_g~O~15L-n zKv%Y6AAo7(7pexk-qI*oC**?~L5*+s6v#^@8fYg5ef34NL_DSfDd7I&>HPn3?)oIU z{_KU`&b~fhI2|bX+V`{ncmIWSnU1%#SwErU|J&`?xly%CL3za0o{^!7%bn@O>;1R& z&whS>(@4VX{QTwjVjgY;tx^GrUe)#!{>8~~A=pC5VO_gTe~DWM4fymvOD diff --git a/icons/obj/items/clothing/ties.dmi b/icons/obj/items/clothing/ties.dmi index 17118d87609095d17dc5407f08f46da33426c5ce..bd09e96affdb2b1d95b3e41402c924e3ef474617 100644 GIT binary patch literal 22562 zcmbrmbyQW+*C@IPX#@mGB_*X>>JZW;pmaBgfYN#BMoQ`KZlzng8>FSX>i~zl`Q7i0 z@xD9W9p4|10b{RTYtA)ut+@#Opd^irL5cwY0Jf~mdsP5H5C#7z(NMsWZqwou06@fc z|ETHs-ps+|o0Ywzm7OgBxTgM`>9Ad3#{$M2?q7;~ECs#U=SiUIj+VH?L}3|^$JOGN zkrlhX6y(?O%}%krF-D4d!Pp;5J{+~3k)Yw=-Qf6A3z61=Q+efT>4;GGYRj~hqA9JH z{kGX#CMaUdl$^XV4U>7x^!bvlY2sI}N6a@SS8w78ZT?ab4rLt@rv)iSBy!t_7*-S$ zG8Vh*W3Z`w3Zvg*-(k-ATz9>dm~5?H%bk-#%)w*C#2mJv)+DbGXH3j|GQ~Qs_9J4^ zk?&PdbbfvbLql8s2Ng$W!^U5zc6oRQpQQ6DIcKTjuQb(vEc#>H%0DmB_$gh-fAx}< zFV93978rJU$mmZw|Du+R1-%-FoIk4%o(5sOF(QNTHWbJp)yvi}E^cbbFT%fs&AIuO z5;x!(V_A_>Y0G6tP)W%b&F&t2#bVYf2&As;BF*L`kw3@kk5Ni68}HaFeoj}2>*Q!C z*Y?+eg-X4fmq*2hEr3@1dC}0L&z 8SR@NFOS_yj}u-)9(4YGt-6MAtp)XgyK0Y4Y_sVQsXa+4($XXb=?to`Cstlf0jmS z>K@remmOb|9T@ow|7M}xUvOA=r>)i2to=}X@(^&4cS6AYeu?T)EAzDhLPt;`{l2rou$~w zb<}Q>(!`r#POhwBHxY8THx64v&753G8p{?*4g~Z{sepfnAwP9w*;3_bJh3?BQDiMZ zJhh_Bke&D}i=7Zb)xTtLQDO6QA6 *=P!EOc+$DQT6MBP7@$5C ztv7PK4;}uf_ )RD6G#2U$6H${P$*Q3C-D8vTii8zg_!GQJ8%+2-9@u$f)@nn zjxPnIbH_`ggz0ERb+UOK_Hnz-ml~ar0rR0msv_1%#Le$;25yWWg0P%1h7U(OQQ|qG z4LJ~u|6WlkA`SH+ku+2jvhDu+{k33hZtk1zMyLIdDHJq&I!m1M9OkIkN(V;XKTho; z>95!!1FIeWp~6E^-!2A2|B!D dSTA4O4J&ffzxk(2}uWTK_>>dXSp2Yvf* zXlWS%R#;9<=EsOMk&O3_`~Fpv+Y5P#ZC>|pI4Sv&7kZVe!{I+})nsG}a21ju-C$#> zNa`}3x}HLnoP+EPH~SYPb6UPb{#WlF4gM(7y-wljCHfk7m<_#m#=6~BTWk`(= W-<;xv zF;Y397+H~&Al?VbpM59g2^*8b1<^jA(>~-MhxP?I^u+%_Wfhzb{R=X>{nrFx3?Xm9 zpfRcF^2mJ`0?X4l%JQadV&S>!m<)mU-0Iq@rITkm+N#VY-s&n@{bogOAK;<|o7ZBu zNLrWj^74wT@``e-zLlGNv 1njlYKt@SwcIf8D62w($S;s zxoM5QrR_7UOhoonUyF 5q#ZdUXWtuNzhLtYVA3L75>Y1 zN#Ge^GgsNM%1g#;L)n>NzvTA}li=C2XHs=$?8NagdQ0;inpJ!{|3+}d<8msRHuLUF z^1{iq8|$e$C&?HkNfnmP%+h?-%7B@ dYM z$1D8}!Y1phwVKpSqwuG~>uiL)3u^<|ody%aZolUA$%|z*H;{;Her(mT)ejZj#>I+U zHSWU=Trzy|Q$ (WTOPaRSD1v%AAt6=%|TgJ)mUaa zSLH2lC`|WlT-|zw$hYgeNqRoM*>V`8oAb}$;^sfLfA!3GAp`Ut&Wu~VUoV^4o&}N) z#i{15MIOfqZ(+Ys*=Nsn4Vs )8a*h^54_@^;2#4$Bget;vjS<%Y{fFF&?=f7OJxeAKl5me0;lo|)*M z6!y-16~sz^i-+!MIBztu_DZQ17cvTp@xTwp*n6h==o=duPwCe$pxfTI#LO5xZIAFz z5L79iISl6b)6idR15bp&T|8;Gv{Y$?WcOV)nZkc<2TjMfX<&*(n@K?_{FXoRia9{a z{k5R;#$;@4tRtypZV-0pXwV;*DXLSliCh_}I|R~V9D*6lJr^6^i}^8U ebr=GjHHzn#h3hDPezeViedigag17mr5%WZV}r5 zNi-2$CF8vDzCnL>c&?E#jKj`_IF+%g3r(y19B$tNZ@LHub@fKJ*eH6oo#qyCVwQ;a z&^>WPkgOLUq x{Qoa z`V84$5&pMKlJuo9JMj!Vhb=LJ&slNs%~m@O%H2u}o?u8l|JS;UEn(DsFACvzhIo|z zr-@u(vrr7o&WH}LwSQB@c7L81PglezuYh^HmxO=F=(@O>5lz|m5JsJB!#}h&7Pw(u zo}&oVNg8Ya9!?HYnEGgHW#uj3D&aOQQP0m)u9mUIrI8}(gC!;Wp7 jj+_z1Tg4v|CN&K0_h%F#!k+(Fan#{N7!E*v4`JzkID> ^({voOnX&b+I~+w~#dfK&Kl@R|>Xn-#CUI_}1<}J76MbIS`}J11 z7U6?I@Ctk3;{@EfdPmSBk|r33kn%! e~s zg%h&2$RHoDt8eceA^Ei|ob7o;|8By)wtKI~vaf-9k2{)rJwQBtHm$^QcbA{~H##Y2 zlTlX?$&km%su-9>zl2i0J$X+?Ik)nfq)yJ-3y1LnJ4tVrFsPtwk$21NfA^5NPM11M zr!r1iErU)cD#GMH5et=)aNpwKEyH9lTFdY51g|PILg(l#`wn1NC)|nGbC3G8Gl`iT zH26sJSFg!;Q0*+}DaUX?LYy8?J1sKcdHIQ n)X4JLk6pem(XO^fq`|ht&{ZwZmmcbzPy0;Q zGc &4?W(^LPQg)aPsI-ECNy~zd2WFiqU z@dg+^Z`Dbe^e4EdTT=I$gR-!x LV(1yo|x02IwYqWh= z9_*OMqfWG=bRzzdJ#saq>G-V0nK9m7AJ_HWGpwzx#qL61dJvKn$Vb>vmBV9=9+){H za)l}U+t9mJ0~RptP=Kp)5j9L)XyOfw-J!ZHHfdOWYa%>S>>ghc8KXX5zeHl5<@5icqp_ %EXQnJA7Y0QC)G htM3+yJ*{ &9FR4!zw&N-(abr^KtTa$>28H0troIUZNVT%8#GS*#CaD z7ABJoUY4*2UDEb6lf|fxI{zBWaf)`5P>vjV#WE|Hh(k~liO1CeqxOZF95mXP+?&4z zk!sZ8(nrwwAo@L|r51zT*ik(0t!MiKo;#092;l?5w3PXVOLx*MX}Q~%fM|d`(Ren* zhpXBo2_?c@*dCT=98l-|0yvRinpI| ;ee z)JDCrM~REeq~Ew{Z&=>FuI1RM+i?7$A-vJpq$?*Gg=>&H_~HB(DzCIn2628R?Ef9X zDIu9zpee7IsW9%X lQckRiE zeQtifcqxoe4VK(az4%TY`8f4??0!Ll`YD|SS_NIIZea@kgnS95`UAzL{wEZ>Z$TmU zyNEvF#K)h^L`z{1IdfTB)}leDiF?+1Q75tRX2>Ak?*3B)E_o&@uvbMz@dh|u4Bj*h zK{2MNIH2JY`om|-cMb|C29Y9}7)1swD6kjQBJUUUQVA>je}LHKZd={7`onfyevnU< z1dr78?z)jaDGM%?Yn~g0>Z(ibrPu;hkrbZvh@)Bja{c8U{lbp#IXu_8AYPi!-3}WH zAz %?_DMhke(qzuSd5VS$v}B|k)eUs7j1Xy1<5Sp8ewI; zvIe~d@W^d(?8N1HW8Zx+U(>%cp5x}g5x~AD;IM@ighRpF0FQEs8!xV)KYArE<$7Z& zdqMPCs5p_Qk}dSYHtYj2+h2?v5j80*MiZR2T+K1Nm%Hmc(R_RoXgMMy44`yrJ8q >aPx)J|o(Z71W_k2p?L0K|4Pfwi5+%L)M747V z8XmWo?M`WjibhukgTEWv7<$S`MS;vuE6EsZx?(P{pSLWSsx;b%DxFEL?d)WBHp=gbbF zPPDJL;|zK?PBgRXjXA)&anW zPx1Z{pBI}18pIvf@x>JbNn?tHs&`Rmro7VMIY_B`SzAw`DQ?Cf{=dHn?Z+fUrVmqS zktvUn^3eEjTTcPlbiP#N*hliubIseCogc#U^Yqj$;ZG_Zq-dGJHm$eWQ}iGolO1Fx zPo)YGc(|`l*AcBY{TjUO!8Q`;o^v;H|0+pap++QIEDka-jYT&i_}O=K&z~}L1 ++;;m_KSNRzl?X7@iO zJ{|U@a15)QNzRBSY6@6QDo;Dv-u#RbJdEh5Xa!oN#-)=rMI&SRGdiT*XRk95UQh1( z{>94%4b-&DZO$oy1&J}$QXH-)3sIsJPp9?WiNEp4oC>nf$Or99JhdRp(6!wztmqEQ z_KhF$Q`X2 SL_XVCx8zB>Ke&I$w3V1NV0(qz@lluwTt*i{ zX4ghaIL9REhhAr=vO4uPRtfIelMACILt-q{%q+!Z+x-A#g8%XsYC1WHv4R6hDE&L^ zH4{Mt`~S#vn?gj5)EwMi@*O1?iSRlyP^_JB{pMD|A>qtbw-`EZdtBauGY=aOt(z;B z{A&A>VaMJGkw2g94ndc V{oJt}n`uCRw zYD!9g=_dxC-Eu%p4Hpv=6V~!ai6AVhCu4YKF#uc&4GT@@X+YFlPYK=A?Q~>rb%C|4 z-vgONktsZpW0#|UBqh>Rf~0TF>QiE^f1-a+tPH5NJo2MG&o>+odt9BFRx_u7ri`@Q z9C9B2)G_nB5_z oD% zW~^|xyzs8(hU9#wW=~t>7aGF>#;Ew)H%4~c9}Y`t!Nrr4lcS-nUM W$uxs(!kHt6aHG v2qC*l(TADLc)ziql&{n%Y5 zh1GiX`cOfg{+9N`w{N-deb#!OufY~EnS|EXt!v6_VppSbRywu%S%|jopS9ndPF{8% zVnmEC=+T4tCYi<`nY=D#vV9C96$}8eTZ5u}Y<_aG6?XFXjCsBe)v>p^3BIo6csxg5 z>@k1u|5$6J3V{q`iqb=Jcu~m2=z6eeI)frW-y^`i;S8IqCli~JyUpH1UfVwyi$uJ+ zx%o!!y0cT<)y*xdvJ!V>r04Q26Vr_+Y(YmAkIe?i!X^QU=qn%X%gCQS!AQ`;vVZ5h zc6PE7eIRLvoE>vpk_C$0x+IUBqW(Ji;@EVsK=1TD!?xlJfw_uANXzKsf{8v&mK^Qh zJNJK$jcB{tEaE@qazFpF=lcqmul?jH@^Hvvg+>Bm-fEeen0y(5VW!ZYjSEwb=*XaN zvMFi&FpT>d0DNg61XrXTF~jy8lVhsVs1zZ9TD{7}^q% s&F89gt`_4m_z~As<1j;}iTlA5|2r 5>1QQ!SSBNCTr5rBwjt&FI5X21*aKlz&CnL9V zu<bs%xNUX=B_adZhR9X3e0m+s1S&&$(IJ`zp0yaHWWoAPTeDamJiYmFHh6f47i zs=B&ZKji|et2sq7=7a{={7HG}_<5|^ff3|31tBcJa|Oa!SXd}}fceFK^@fGpsR763 zI=MkrUT&(8d3z?~;ZyQDpEDf)5f(nGrmk-Osn+88?6f2xG+tl^tPD%up}B4+47$EY zBNwKgOHupoQyj!~97uJs|1hN2%O0VHBBNYdSA);}^3xb`(&o~_JbF>|k$8P$V|HmN zR-N4nZ=*gF5_0=Xs}h=KGm@q%`#BkA!FnAFuk!aOXaMT>mCnNrhn`va{GqkIy|AGn z13~G62^K_SNB8Ef^~f)DS5MrvFO*{ HfDhJyf*P z{!xf2CZ}a3D0OuxMyEeN-xoIV@9!=}RL~RT+{kC)d+lGJPf9znrDR~~G9?S}bR4*> z(0}@=&Cl~GyGRZH 4A13gBBZR+ tYy 1*9t^?$nSzg 3x8IB$7egLbWS#rfKqh2tW6j5q($Kz zb^%Io%v!VA*dpr9ofDf AdX@fc1(!vS UmuO{tQ@-mmACi7Oh5T^SVjBl zU2r*%UZ<)MQGP7?6CuRrYU_>(f`km%c+bg6KQ`=;OV#}fGRB_Wlv=?Z)*`fJLjle7 z`}kB4kO6uKHz{^8)33tfsm_Ikl*iKXM96XFFB@XKUOxB}BF7lU#@ro>&Sh}{0cC&9 z6!XJ4O5kSTB405@`=|LJm~l);sp1_@rWgAo;H{I6oOK8INdLUXn}h_7&K78JKi*D` zwu)-0pr;qYHGXg2w+V0YOmuW%Q;{#e8)9IU`1X}iyQ!h`*BzJC<$~}jP$xfVXsIKg zfee~3r~7p)|MF(_*E0?>$6%r+po@UFb~S@lDEf4ovy1mn=WXMYHvqJsDuRatRx~ma z2blF<8w@WNFJvzk8UrD}bL^BTwSHb3DSoX#q89_w3dBkkYY5ijkbeqF+|Oh0qa2 zx2 kF9T|{@ihHHM$`UVsx`^grmvDz}^ z+6|z3qDCr=Ap3(PO+{Wlt^CdY4N*d8%Vz?@#IZK_HR`s*KsViE|D(6}(YiKnE25wQ zFk7L!wSNo}vOo|Du>o&w3&9Rq2906gMu52`qm3n6(0ubd^EW|Q9xvbeiG#<|)m*qI z;x2{X4cZ^e^a4d%vQIm*p-8|YkvRYiY=vs5z VCDT_#w>!rvF){2 zgOR~&B)MNdjO$)J_27{5H -8=ApK|4x*}}`H)q{*;tlmN{~R6qj~+x zR<9n|uRH8qvN^H}{yB;eNg%o!@PV0(D9ZksSXj)LFOn-`d)kC44kXqWm6U8 ` iJxP75GI0QA eVFh({g0AQPuZ;0e zggs@5#jvB}Z_2v#cYU{M &JTwLc9`nJ=>HZA@gTx_>YHBteAaJft~tW3 zJgynA6r(I~c7AwHULD08dhBG_HH<=<;5?Q425l8>(~_%IO)iW(x~axPW44jrPu79- zN^1Kf85%@BuvPylKQkn4jS1Uc(BIC`gE~L#-(A)X0GBxYB@>NBsNJGaXV->IuF1i& zJO1`^aAfhl^UJy-ynuAHhDU@*s@}lL?e2V#r6tAo#dsq^Y8E2<%G 3j#; {1Kl2UFY$xzhh(?3B3s(G%H_bx9iSWc?r{5#IgUoEF6YS^Do39M=JBd zhY1eXneqN0{=M~`@0dI8J2-Yx5Ln~MhgQVHm v1toGn{-Eic zmvmlQ%~z(*%YOA>I%V@p3!|VU-ID;(z8kkeaGi8QtL4Ou^XO9Z-G-ClY(^7Y>1VpA zX-qDx;`ytvFL%!kosk;hHu|gXep`EV)n8T+hV-w_P0qJ-M)v~Q@F5jaAsG)j%qw5F z_k7<}oE-PUQbPjY&1NJ=yKKv5XW%%DIC(Y0ZP)|cJ6#~;)z=#A;m}t8Trul;GKY$` zk8Su4qfTB;aAw3(ddqTKYSsIiaO|=iYfJ5`p2dB(>El0(4tgu)kZ@ohec|eL p3Q-TBQtl z62#Ar#4T2#-$L-zshk_dUj<^+Wt7xWq*ic~U0KB4py`&!#W=o!2o!U^0D!kWwK0cH zb2@G31#kQ3Q(pn?6Xla;vvu32y?_2hpRk^*d~$t7LSk{Mz2JOvwS~>#Re%5-Z9_xx z>6N&5tdq~)9iJfd)%f}XJ|zyzzxEQfUT2bw6)I~!61{rGe0Tjc8-h>3mzrDdx-C4w z$IZYWm{< `SM@U}fy} eQk4T*QH8Bz=HV0M6Sn+gM%(Sy+Zzels*Es@g306 z-&NR&oaH@pQ~2(USWFv^S82(?OD80*WJ?ZEj;$!irhF*OApP?ISP`HAYDhuy#Vfay zKLbctBIlw$m$kWta&`WW8RhF+k1B#6)>)on0qy2qS{XICl;_K0w@Iw z(5}zhkO5ih4qEy6okjojPedvkQ`q2#!{L^y|0o#553aSRT9b3pFZke~2JY^@zXcK! z3#VAhJ`e@6A86Fb5uU$AG2Hu G=jXz{p~%B{e0zdpkD zX*xxGc!-Wm33fABd2uQ9;bAJ%GZ$rZJ)>1(P57MteFR$vxOr8z`;MMPf1}tw-O-L0 zY`M@}nfPy^`at;j*wW%RZyt9A3FMoUwnu$`^x^<(dRsY?;TEeKmx!F4BZz>2(;jj~ zOVn7A8a>c{I7mUmFov%TQ;>8`xHX18!=eyL{qggs*v%dR-k&xc3K8AdyQt)qsdBw1 zxN6?LTg(_G;DdAVw1H_)*^XDtyrOFd`;Nwz0@6i42#^?%?EP{5E2{T|RBLP(`G 1>Q@{KK~=m8%( z|EUmS1L{U}v|(k}d%)g#<4xLT+Hr4)tzXY~3IKWlXb_Q9S!9^f$%MB6V~zWF^_NhO zuhyzM?M3K)x6bvyZYi~0yeI%%f}PN*w;73l)4CN>cq0P>1I5bJ_nY;}$1 gX26P)gUZQ#Ox(%8b1lmy z-j~3e@mUDGhK7FaYS?}mIdH!SU9NwmQ2A#4 _YhQaF{3*5}}`D7{{pgL{a{bLiUyXX7t5YlJ6@@s5B*C zP(+%W^$EO;E-ZFWk5zTWIuplZU$wQ~l1vb--(ZX7G@orKF}R&7H!uIe#94VZQ1N?K zi;b7Hm9>wBt(|6@-ckRny!Yyg!yxABzkTZDe0CU;H8ms*UhVyc!G?u5s2hdf`I@!+ zDkdl7Rrj(sngAW7#f>z5St!y#X{gV#5>~roaj;b|b_tV|tZGC3V1ig@7qkxIsn#|n ztd@YK)m^nYJE3(KBkFN}DP^qj3sd@1OaH1nV`eW!2ET!{2CEm<(Rx(o$qbK>%^6Vl z{7^i&`})oF;NYy`Y6t=`zcH}Y3JHf^pPvS0MDew;vKi3KyNpHMH%ny9Xc0>JZFLHW zL$*>^?!?NnkLOwNPge>WkpTGJN0-zk&KLs?4V8J-zfvMmAk~M=)hJuEfwcOsZn7gp zd4p+z&wE