diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
index e2bd155fcb0d..cc1831501bad 100644
--- a/code/__DEFINES/radio.dm
+++ b/code/__DEFINES/radio.dm
@@ -61,6 +61,10 @@
#define RADIO_CHANNEL_PMC_CCT "PMC CCT"
#define RADIO_CHANNEL_WY_WO "SpecOps"
+//Listening Devices
+#define RADIO_CHANNEL_BUG_A "Listening Device A"
+#define RADIO_CHANNEL_BUG_B "Listening Device B"
+
//1-Channel ERTs
#define RADIO_CHANNEL_DUTCH_DOZEN "DD"
#define RADIO_CHANNEL_VAI "VAI"
diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm
index 5dabb4545a32..d33e26c1c3f6 100644
--- a/code/__DEFINES/skills.dm
+++ b/code/__DEFINES/skills.dm
@@ -42,6 +42,8 @@
#define SKILL_SPEC_DEFAULT 0
/// Is trained to use specialist gear, but hasn't picked a kit.
#define SKILL_SPEC_TRAINED 1
+/// Is trained to use specialist gear & HAS picked a kit. (Functionally same as SPEC_ROCKET)
+#define SKILL_SPEC_KITTED 2
/// Can use RPG
#define SKILL_SPEC_ROCKET 2
/// Can use thermal cloaks and custom M4RA rifle
diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm
index 998fba978496..086b70a92428 100644
--- a/code/__DEFINES/vendors.dm
+++ b/code/__DEFINES/vendors.dm
@@ -70,3 +70,10 @@
/// Vendors with this flag will fill retroactively based on latejoining players,
/// and expect a scale multiplier instead of amount of items
#define VEND_STOCK_DYNAMIC (1<<10)
+
+// Redemption Tokens
+#define VEND_TOKEN_ENGINEER "Engineer"
+#define VEND_TOKEN_SPEC "Specialist"
+#define VEND_TOKEN_SYNTH "Synthetic"
+/// Token invalid/unrecognised.
+#define VEND_TOKEN_VOID "Void"
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 36dcfed6cfea..967967790b28 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -30,6 +30,11 @@
text = replacetext(text, char, repl_chars[char])
return text
+///Helper for only alphanumeric characters plus common punctuation, spaces, underscore and hyphen _ -.
+/proc/replace_non_alphanumeric_plus(text)
+ var/regex/alphanumeric = regex(@{"[^a-z0-9 ,.?!\-_&]"}, "gi")
+ return alphanumeric.Replace(text, "")
+
/proc/readd_quotes(text)
var/list/repl_chars = list(""" = "\"", "'" = "'")
for(var/char in repl_chars)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 743f9be9fec0..741862b5d65d 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -127,3 +127,8 @@
min_val = 1
config_entry_value = 450
integer = TRUE
+
+/datum/config_entry/number/whiskey_required_players
+ min_val = 0
+ config_entry_value = 140
+ integer = TRUE
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
index 95839b726151..b8b037c33381 100644
--- a/code/controllers/subsystem/communications.dm
+++ b/code/controllers/subsystem/communications.dm
@@ -71,9 +71,9 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
//Misc channels
#define YAUT_FREQ 1205
#define DUT_FREQ 1210
-#define CMB_FREQ 1220
#define VAI_FREQ 1215
#define RMC_FREQ 1216
+#define CMB_FREQ 1220
//WY Channels (1230-1249)
#define WY_FREQ 1231
@@ -99,6 +99,11 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
#define CLF_MED_FREQ 1274
#define CLF_CCT_FREQ 1275
+//Listening Bugs (1290-1291)
+#define BUG_A_FREQ 1290
+#define BUG_B_FREQ 1291
+
+//General Radio
#define MIN_FREQ 1460 // ------------------------------------------------------
#define PUB_FREQ 1461
#define MAX_FREQ 1468 // ------------------------------------------------------
@@ -191,6 +196,9 @@ GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_CLF_ENGI = CLF_ENGI_FREQ,
RADIO_CHANNEL_CLF_MED = CLF_MED_FREQ,
RADIO_CHANNEL_CLF_CCT = CLF_CCT_FREQ,
+
+ RADIO_CHANNEL_BUG_A = BUG_A_FREQ,
+ RADIO_CHANNEL_BUG_B = BUG_B_FREQ,
))
// Response Teams
@@ -205,6 +213,9 @@ GLOBAL_LIST_INIT(radiochannels, list(
// PMC Frequencies
#define PMC_FREQS list(PMC_FREQ, PMC_CMD_FREQ, PMC_ENGI_FREQ, PMC_MED_FREQ, PMC_CCT_FREQ, WY_WO_FREQ, WY_FREQ)
+//Listening Device Frequencies
+#define BUG_FREQS list(BUG_A_FREQ, BUG_B_FREQ)
+
//Depts - used for colors in headset.dm, as well as deciding what the marine comms tower can listen into
#define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
@@ -269,6 +280,8 @@ SUBSYSTEM_DEF(radio)
"[HC_FREQ]" = "hcradio",
"[PVST_FREQ]" = "pvstradio",
"[COLONY_FREQ]" = "deptradio",
+ "[BUG_A_FREQ]" = "airadio",
+ "[BUG_B_FREQ]" = "aiprivradio",
)
/datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index a56e10636a1e..79bd10c65736 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -276,7 +276,8 @@ SUBSYSTEM_DEF(vote)
var/datum/game_mode/M = mode_type
if(initial(M.config_tag))
var/vote_cycle_met = !initial(M.vote_cycle) || (text2num(SSperf_logging?.round?.id) % initial(M.vote_cycle) == 0)
- if(initial(M.votable) && vote_cycle_met)
+ var/min_players_met = length(GLOB.clients) >= M.required_players
+ if(initial(M.votable) && vote_cycle_met && min_players_met)
choices += initial(M.config_tag)
if("groundmap")
question = "Ground map vote"
diff --git a/code/datums/ASRS.dm b/code/datums/ASRS.dm
index 86a7363f07ea..73b0f4e1c6a9 100644
--- a/code/datums/ASRS.dm
+++ b/code/datums/ASRS.dm
@@ -132,3 +132,8 @@
buyable = 0
group = "ASRS"
cost = ASRS_VERY_LOW_WEIGHT
+
+/datum/supply_packs/ingredient/asrs
+ buyable = 0
+ group = "ASRS"
+ cost = ASRS_LOW_WEIGHT
diff --git a/code/datums/components/healing_reduction.dm b/code/datums/components/healing_reduction.dm
index b98d52cab251..54ea02dc6b73 100644
--- a/code/datums/components/healing_reduction.dm
+++ b/code/datums/components/healing_reduction.dm
@@ -21,33 +21,36 @@ Humans will take continuous damage instead.
src.healing_reduction_dissipation = healing_reduction_dissipation
src.max_buildup = max_buildup
-/datum/component/healing_reduction/InheritComponent(datum/component/healing_reduction/C, i_am_original, healing_reduction)
+/datum/component/healing_reduction/InheritComponent(datum/component/healing_reduction/inherit_component, i_am_original, healing_reduction)
. = ..()
- if(!C)
+ if(!inherit_component)
src.healing_reduction += healing_reduction
else
- src.healing_reduction += C.healing_reduction
+ src.healing_reduction += inherit_component.healing_reduction
src.healing_reduction = min(src.healing_reduction, max_buildup)
/datum/component/healing_reduction/process(delta_time)
if(!parent)
qdel(src)
- healing_reduction = max(healing_reduction - healing_reduction_dissipation * delta_time, 0)
+ return
- if(ishuman(parent)) //deals brute to humans
- var/mob/living/carbon/human/H = parent
- H.apply_damage(healing_reduction_dissipation * delta_time, BRUTE)
+ healing_reduction = max(healing_reduction - healing_reduction_dissipation * delta_time, 0)
if(healing_reduction <= 0)
qdel(src)
+ return
+
+ if(ishuman(parent)) //deals brute to humans
+ var/mob/living/carbon/human/human_parent = parent
+ human_parent.apply_damage(healing_reduction_dissipation * delta_time, BRUTE)
var/color = GLOW_COLOR
var/intensity = healing_reduction/max_buildup
color += num2text(MAX_ALPHA*intensity, 2, 16)
- var/atom/A = parent
- A.add_filter("healing_reduction", 2, list("type" = "outline", "color" = color, "size" = 1))
+ var/atom/parent_atom = parent
+ parent_atom.add_filter("healing_reduction", 2, list("type" = "outline", "color" = color, "size" = 1))
/datum/component/healing_reduction/RegisterWithParent()
START_PROCESSING(SSdcs, src)
@@ -64,14 +67,14 @@ Humans will take continuous damage instead.
COMSIG_XENO_ON_HEAL_WOUNDS,
COMSIG_XENO_APPEND_TO_STAT
))
- var/atom/A = parent
- A.remove_filter("healing_reduction")
+ var/atom/parent_atom = parent
+ parent_atom.remove_filter("healing_reduction")
-/datum/component/healing_reduction/proc/stat_append(mob/M, list/L)
+/datum/component/healing_reduction/proc/stat_append(mob/target_mob, list/stat_list)
SIGNAL_HANDLER
- L += "Healing Reduction: [healing_reduction]/[max_buildup]"
+ stat_list += "Healing Reduction: [healing_reduction]/[max_buildup]"
-/datum/component/healing_reduction/proc/apply_healing_reduction(mob/living/carbon/xenomorph/X, list/healing)
+/datum/component/healing_reduction/proc/apply_healing_reduction(mob/living/carbon/xenomorph/xeno, list/healing)
SIGNAL_HANDLER
healing["healing"] -= healing_reduction
diff --git a/code/datums/supply_packs/food.dm b/code/datums/supply_packs/food.dm
index 9e0527aed6cf..f74567c78a89 100644
--- a/code/datums/supply_packs/food.dm
+++ b/code/datums/supply_packs/food.dm
@@ -1,144 +1,47 @@
//Food.Regrouping all the ASRS crate related to food here.
-
-//All the ingredients that you can grown.
-
-/datum/supply_packs/potato
- name = "Potatoes(x20)"
- contains = list(
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- )
- cost = 10
- containertype = /obj/structure/closet/crate/freezer
- containername = "\improper Potato crate"
- group = "Food"
-
-/datum/supply_packs/tomato
- name = "tomato (x20)"
- contains = list(
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- )
- cost = 10
- containertype = /obj/structure/closet/crate/freezer
- containername = "\improper Tomato crate"
- group = "Food"
-
-/datum/supply_packs/wheat
- name = "wheat (x20)"
- contains = list(
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- /obj/item/reagent_container/food/snacks/grown/wheat,
- )
- cost = 10
- containertype = /obj/structure/closet/crate/freezer
- containername = "\improper Wheat crate"
- group = "Food"
-
-//All the meats
-
-/datum/supply_packs/meat
- name = "meat(x5)"
- contains = list(
- /obj/item/reagent_container/food/snacks/meat,
- /obj/item/reagent_container/food/snacks/meat,
- /obj/item/reagent_container/food/snacks/meat,
- /obj/item/reagent_container/food/snacks/meat,
- /obj/item/reagent_container/food/snacks/meat,
- )
- cost = 10
- containertype = /obj/structure/closet/crate/freezer
- containername = "\improper meat crate"
- group = "Food"
-
-/datum/supply_packs/carp_fillet
- name = "carp fillet (x5)"
- contains = list(
- /obj/item/reagent_container/food/snacks/carpmeat,
- /obj/item/reagent_container/food/snacks/carpmeat,
- /obj/item/reagent_container/food/snacks/carpmeat,
- /obj/item/reagent_container/food/snacks/carpmeat,
- /obj/item/reagent_container/food/snacks/carpmeat,
- )
- cost = 10
- containertype = /obj/structure/closet/crate/freezer
- containername = "\improper carp filet crate"
- group = "Food"
-
-//all the condiment type items
-
-/datum/supply_packs/condiment
- name = "crate of condiments"
+// crate of random ingredient that you can buy in vendor in kitchen
+/datum/supply_packs/ingredient
+ name = "surplus boxes of ingredients(x6 boxes)"
+ randomised_num_contained = 6
contains = list(
- /obj/item/reagent_container/food/condiment/enzyme,
- /obj/item/reagent_container/food/condiment/sugar,
- /obj/item/reagent_container/food/condiment/saltshaker,
- /obj/item/reagent_container/food/condiment/peppermill,
+ /obj/item/storage/fancy/egg_box,
+ /obj/item/storage/box/fish,
+ /obj/item/storage/box/meat,
+ /obj/item/storage/box/milk,
+ /obj/item/storage/box/soymilk,
+ /obj/item/storage/box/enzyme,
+ /obj/item/storage/box/flour,
+ /obj/item/storage/box/sugar,
+ /obj/item/storage/box/apple,
+ /obj/item/storage/box/banana,
+ /obj/item/storage/box/chanterelle,
+ /obj/item/storage/box/cherries,
+ /obj/item/storage/box/chili,
+ /obj/item/storage/box/cabbage,
+ /obj/item/storage/box/carrot,
+ /obj/item/storage/box/corn,
+ /obj/item/storage/box/eggplant,
+ /obj/item/storage/box/lemon,
+ /obj/item/storage/box/lime,
+ /obj/item/storage/box/orange,
+ /obj/item/storage/box/potato,
+ /obj/item/storage/box/tomato,
+ /obj/item/storage/box/whitebeet,
/obj/item/reagent_container/food/condiment/hotsauce/cholula,
/obj/item/reagent_container/food/condiment/hotsauce/franks,
/obj/item/reagent_container/food/condiment/hotsauce/sriracha,
/obj/item/reagent_container/food/condiment/hotsauce/tabasco,
+ /obj/item/reagent_container/food/drinks/bottle/whiskey,
+ /obj/item/reagent_container/food/drinks/bottle/tequila,
+ /obj/item/reagent_container/food/drinks/bottle/rum,
+ /obj/item/reagent_container/food/drinks/bottle/wine,
)
cost = 10
containertype = /obj/structure/closet/crate/freezer
- containername = "\improper crate of condiment"
+ containername = "\improper surplus of ingredients crate"
group = "Food"
- //all the finish snacks.
+//all the finish snacks.
/datum/supply_packs/donuts
name = "box of donuts (x5)"
@@ -165,47 +68,6 @@
containername = "\improper USCM MRE crate(x2)"
group = "Food"
-/datum/supply_packs/funfood
- name = "special ingredients crate (x6)"
- randomised_num_contained = 6
- contains = list(
- /obj/item/reagent_container/food/condiment/enzyme,
- /obj/item/reagent_container/food/condiment/saltshaker,
- /obj/item/reagent_container/food/condiment/saltshaker,
- /obj/item/reagent_container/food/condiment/saltshaker,
- /obj/item/reagent_container/food/condiment/peppermill,
- /obj/item/reagent_container/food/condiment/peppermill,
- /obj/item/reagent_container/food/condiment/peppermill,
- /obj/item/reagent_container/food/condiment/sugar,
- /obj/item/reagent_container/food/condiment/sugar,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/grown/potato,
- /obj/item/reagent_container/food/snacks/mint,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/tomato,
- /obj/item/reagent_container/food/snacks/grown/carrot,
- /obj/item/reagent_container/food/snacks/grown/carrot,
- /obj/item/reagent_container/food/snacks/grown/lemon,
- /obj/item/reagent_container/food/snacks/grown/lemon,
- /obj/item/reagent_container/food/snacks/grown/orange,
- /obj/item/reagent_container/food/snacks/grown/orange,
- /obj/item/reagent_container/food/snacks/grown/lime,
- /obj/item/reagent_container/food/snacks/grown/lime,
- /obj/item/reagent_container/food/drinks/bottle/whiskey,
- /obj/item/reagent_container/food/drinks/bottle/tequila,
- /obj/item/reagent_container/food/drinks/bottle/rum,
- /obj/item/reagent_container/food/drinks/bottle/wine,
- /obj/item/reagent_container/food/drinks/bottle/wine,
- /obj/item/reagent_container/food/drinks/bottle/wine,
- )
- cost = 10
- containertype = /obj/structure/closet/crate/freezer
- containername = "\improper Special ingredients crate"
- group = "Food"
-
/datum/supply_packs/pizzas
name = "pizza ready-to-eat (x3)"
contains = list(
diff --git a/code/datums/supply_packs/operations.dm b/code/datums/supply_packs/operations.dm
index 6d5e5d14756c..dcc270cb00a1 100644
--- a/code/datums/supply_packs/operations.dm
+++ b/code/datums/supply_packs/operations.dm
@@ -112,10 +112,10 @@
/datum/supply_packs/spec_kits
name = "Weapons Specialist Kits"
contains = list(
- /obj/item/spec_kit/asrs,
- /obj/item/spec_kit/asrs,
- /obj/item/spec_kit/asrs,
- /obj/item/spec_kit/asrs,
+ /obj/item/spec_kit/rifleman,
+ /obj/item/spec_kit/rifleman,
+ /obj/item/spec_kit/rifleman,
+ /obj/item/spec_kit/rifleman,
)
cost = 0
containertype = /obj/structure/closet/crate/supply
diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm
index 422017c0a46b..a5a12cd5b999 100644
--- a/code/game/area/kutjevo.dm
+++ b/code/game/area/kutjevo.dm
@@ -67,6 +67,10 @@
name = "Kutjevo - Power Station River"
icon_state = "lz_river"
+/area/kutjevo/exterior/spring
+ name = "Kutjevo - Southern Spring"
+ icon_state = "lz_river"
+
/area/kutjevo/exterior/scrubland
name = "Kutjevo - Scrubland"
icon_state = "scrubland"
diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
index 3bc56728a7b9..6ebda633a19b 100644
--- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
+++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm
@@ -9,7 +9,7 @@
/datum/game_mode/whiskey_outpost
name = GAMEMODE_WHISKEY_OUTPOST
config_tag = GAMEMODE_WHISKEY_OUTPOST
- required_players = 0
+ required_players = 140
xeno_bypass_timer = 1
flags_round_type = MODE_NEW_SPAWN
role_mappings = list(
@@ -76,10 +76,14 @@
hardcore = TRUE
votable = TRUE
- vote_cycle = 25 // approx. once every 5 days, if it wins the vote
+ vote_cycle = 75 // approx. once every 5 days, if it wins the vote
taskbar_icon = 'icons/taskbar/gml_wo.png'
+/datum/game_mode/whiskey_outpost/New()
+ . = ..()
+ required_players = CONFIG_GET(number/whiskey_required_players)
+
/datum/game_mode/whiskey_outpost/get_roles_list()
return GLOB.ROLES_WO
diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
index 4202ded30350..37131451ca07 100644
--- a/code/game/jobs/role_authority.dm
+++ b/code/game/jobs/role_authority.dm
@@ -262,7 +262,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
if(istype(CO_surv_job))
CO_surv_job.set_spawn_positions(GLOB.players_preassigned)
- if(SSnightmare.get_scenario_value("predator_round"))
+ if(SSnightmare.get_scenario_value("predator_round") && !Check_WO())
SSticker.mode.flags_round_type |= MODE_PREDATOR
// Set predators starting amount based on marines assigned
var/datum/job/PJ = temp_roles_for_mode[JOB_PREDATOR]
diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm
index 7b5040bccd40..451b57afb296 100644
--- a/code/game/machinery/vending/cm_vending.dm
+++ b/code/game/machinery/vending/cm_vending.dm
@@ -440,6 +440,34 @@ GLOBAL_LIST_EMPTY(vending_products)
user.set_interaction(src)
tgui_interact(user)
+/// Handles redeeming coin tokens.
+/obj/structure/machinery/cm_vending/attackby(obj/item/attacking_item, mob/user)
+ if(!istype(attacking_item, /obj/item/coin/marine))
+ ..()
+ if(!can_access_to_vend(user, ignore_hack = TRUE))
+ return FALSE
+ redeem_token(attacking_item, user)
+
+/obj/structure/machinery/cm_vending/proc/redeem_token(obj/item/coin/marine/token, mob/user)
+ var/reward_typepath
+ switch(token.token_type)
+ if(VEND_TOKEN_VOID)
+ to_chat(user, SPAN_WARNING("ERROR: TOKEN NOT RECOGNISED."))
+ return FALSE
+ if(VEND_TOKEN_SPEC)
+ reward_typepath = /obj/item/spec_kit/rifleman
+ else
+ to_chat(user, SPAN_WARNING("ERROR: INCORRECT TOKEN."))
+ return FALSE
+
+ if(reward_typepath && user.drop_inv_item_to_loc(token, src))
+ to_chat(user, SPAN_NOTICE("You insert \the [token] into \the [src]."))
+ var/obj/new_item = new reward_typepath(get_turf(src))
+ user.put_in_any_hand_if_possible(new_item)
+ return TRUE
+ return FALSE
+
+
//------------TGUI PROCS---------------
/obj/structure/machinery/cm_vending/ui_data(mob/user)
@@ -743,8 +771,8 @@ GLOBAL_LIST_EMPTY(vending_products)
/obj/structure/machinery/cm_vending/proc/get_listed_products(mob/user)
return listed_products
-/obj/structure/machinery/cm_vending/proc/can_access_to_vend(mob/user, display=TRUE)
- if(!hacked)
+/obj/structure/machinery/cm_vending/proc/can_access_to_vend(mob/user, display = TRUE, ignore_hack = FALSE)
+ if(!hacked || ignore_hack)
if(!allowed(user))
if(display)
to_chat(user, SPAN_WARNING("Access denied."))
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index a57bbfe7d29f..36b0b6e44df6 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -447,3 +447,69 @@
/obj/item/tool/pen/fountain = 30,
)
product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL
+
+//vendor of ingredients for kitchen
+/obj/structure/machinery/vending/ingredients
+ name = "\improper Galley Auxiliary Storage Requisition System"
+ desc = "A vending machine meant to be use for cooks."
+ product_ads = "If your out of ingredients i am here for you;all my organic produce are fresh;don't let my potatoes go stale time for you to cook some fries"
+ icon_state = "snack"
+ hacking_safety = TRUE
+ products = list(
+ /obj/item/storage/fancy/egg_box = 12,
+ /obj/item/storage/box/fish = 12,
+ /obj/item/storage/box/meat = 12,
+ /obj/item/storage/box/milk = 12,
+ /obj/item/storage/box/soymilk = 12,
+ /obj/item/storage/box/enzyme = 12,
+ /obj/item/storage/box/flour = 12,
+ /obj/item/storage/box/sugar = 12,
+ /obj/item/storage/box/saltshaker = 12,
+ /obj/item/storage/box/peppermill = 12,
+ /obj/item/storage/box/mint = 12,
+ /obj/item/storage/box/apple = 12,
+ /obj/item/storage/box/banana = 12,
+ /obj/item/storage/box/chanterelle = 12,
+ /obj/item/storage/box/cherries = 12,
+ /obj/item/storage/box/chili = 12,
+ /obj/item/storage/box/cabbage = 12,
+ /obj/item/storage/box/carrot = 12,
+ /obj/item/storage/box/corn = 12,
+ /obj/item/storage/box/eggplant = 12,
+ /obj/item/storage/box/lemon = 12,
+ /obj/item/storage/box/lime = 12,
+ /obj/item/storage/box/orange = 12,
+ /obj/item/storage/box/potato = 12,
+ /obj/item/storage/box/tomato = 12,
+ /obj/item/storage/box/whitebeet = 12,
+ )
+
+ prices = list(
+ /obj/item/storage/fancy/egg_box = 1,
+ /obj/item/storage/box/fish = 1,
+ /obj/item/storage/box/meat = 1,
+ /obj/item/storage/box/milk =1,
+ /obj/item/storage/box/soymilk = 1,
+ /obj/item/storage/box/enzyme = 1,
+ /obj/item/storage/box/flour = 1,
+ /obj/item/storage/box/sugar = 1,
+ /obj/item/storage/box/saltshaker = 1,
+ /obj/item/storage/box/peppermill = 1,
+ /obj/item/storage/box/mint = 1,
+ /obj/item/storage/box/apple = 1,
+ /obj/item/storage/box/banana = 2,
+ /obj/item/storage/box/chanterelle = 2,
+ /obj/item/storage/box/cherries = 2,
+ /obj/item/storage/box/chili = 2,
+ /obj/item/storage/box/cabbage = 2,
+ /obj/item/storage/box/carrot = 2,
+ /obj/item/storage/box/corn = 2,
+ /obj/item/storage/box/eggplant = 2,
+ /obj/item/storage/box/lemon = 2,
+ /obj/item/storage/box/lime = 2,
+ /obj/item/storage/box/orange = 2,
+ /obj/item/storage/box/potato = 2,
+ /obj/item/storage/box/tomato = 2,
+ /obj/item/storage/box/whitebeet = 2,
+ )
+ product_type = VENDOR_PRODUCT_TYPE_FOOD
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
index b489dbab16a4..ecef3ed622d9 100644
--- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm
+++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -335,13 +335,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
req_access = list(ACCESS_MARINE_SYNTH)
vendor_role = list(JOB_SYNTH)
-/obj/structure/machinery/cm_vending/own_points/experimental_tools/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/coin/marine/synth))
- if(user.drop_inv_item_to_loc(W, src))
+/obj/structure/machinery/cm_vending/own_points/experimental_tools/redeem_token(obj/item/coin/marine/token, mob/user)
+ if(token.token_type == VEND_TOKEN_SYNTH)
+ if(user.drop_inv_item_to_loc(token, src))
available_points = 30
available_points_to_display = available_points
- to_chat(user, SPAN_NOTICE("You insert \the [W] into \the [src]."))
- return
+ to_chat(user, SPAN_NOTICE("You insert \the [token] into \the [src]."))
+ return TRUE
return ..()
/obj/structure/machinery/cm_vending/own_points/experimental_tools/get_listed_products(mob/user)
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 84dcac1c377f..299ef36ea7d2 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
@@ -72,8 +72,10 @@
listed_products = list(
list("STANDARD EQUIPMENT", -1, null, null, null),
list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
+ list("Marine Brown Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
+ list("Marine Brown Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Black Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm
index 139ea1cbac8c..6c00364642da 100644
--- a/code/game/objects/items/devices/coins.dm
+++ b/code/game/objects/items/devices/coins.dm
@@ -67,12 +67,6 @@
icon_state = "coin_platinum"
black_market_value = 35
-/obj/item/coin/marine/synth
- name = "synthetic experimental tool redemption token"
- desc = "Insert this into a synthetic experimental tools vendor in order to access a variety of experimental support tools."
- icon_state = "coin_synth"
- black_market_value = 0
-
/obj/item/coin/chitin
name = "chitin coin"
desc = "Durable alien chitin pressed into a coin. There are much better uses for chitin..."
@@ -121,3 +115,33 @@
comment = "heads"
user.visible_message(SPAN_NOTICE("[user] has thrown \the [src]. It lands on [comment]! "), \
SPAN_NOTICE("You throw \the [src]. It lands on [comment]! "))
+
+
+/obj/item/coin/marine
+ name = "marine equipment token"
+ desc = "I wonder what it does?"
+ icon_state = "coin_copper"
+ black_market_value = 0
+ /// What is the token for?
+ var/token_type = VEND_TOKEN_VOID
+
+/obj/item/coin/marine/attackby(obj/item/W as obj, mob/user as mob) //To remove attaching a string functionality
+ return
+
+/obj/item/coin/marine/engineer
+ name = "marine engineer support token"
+ desc = "Insert this into an engineer vendor in order to access a support weapon."
+ icon_state = "coin_gold"
+ token_type = VEND_TOKEN_ENGINEER
+
+/obj/item/coin/marine/specialist
+ name = "marine specialist weapon token"
+ desc = "Insert this into a USCM equipment vendor in order to access a single highly dangerous weapon."
+ icon_state = "coin_diamond"
+ token_type = VEND_TOKEN_SPEC
+
+/obj/item/coin/marine/synth
+ name = "synthetic experimental tool redemption token"
+ desc = "Insert this into a synthetic experimental tools vendor in order to access a variety of experimental support tools."
+ icon_state = "coin_synth"
+ token_type = VEND_TOKEN_SYNTH
diff --git a/code/game/objects/items/devices/radio/listening_bugs.dm b/code/game/objects/items/devices/radio/listening_bugs.dm
new file mode 100644
index 000000000000..4a84df071c60
--- /dev/null
+++ b/code/game/objects/items/devices/radio/listening_bugs.dm
@@ -0,0 +1,276 @@
+#define DISGUISE_REMOVE "remove disguise"
+#define DISGUISE_RADIO "radio"
+#define DISGUISE_PEN "pen"
+#define DISGUISE_FOUNTAIN_PEN "fountain pen"
+#define DISGUISE_ACCESS_TUNER "access tuner"
+#define DISGUISE_WHISTLE "whistle"
+#define DISGUISE_MASS_SPEC "mass-spectrometer"
+#define DISGUISE_CAMERA "camera"
+#define DISGUISE_ZIPPO "zippo lighter"
+#define DISGUISE_TAPE_RECORDER "tape recorder"
+
+/obj/item/device/radio/listening_bug
+ name = "listening device"
+ desc = "A small, and disguisable, listening device."
+
+ icon = 'icons/obj/items/devices.dmi'
+ icon_state = "voice0"
+ item_state = "analyzer"
+
+ w_class = SIZE_TINY
+ volume = RADIO_VOLUME_RAISED
+
+ broadcasting = FALSE
+ listening = FALSE
+ frequency = BUG_A_FREQ
+ canhear_range = 2
+ freqlock = TRUE
+ /// If the bug is disguised or not.
+ var/ready_to_disguise = FALSE
+ var/disguised = FALSE
+ /// Whether or not the bug can be used to listen to its own channel.
+ var/prevent_snooping = FALSE
+ /// The ID tag of the device, for identification.
+ var/nametag = "Device"
+
+/obj/item/device/radio/listening_bug/ui_data(mob/user)
+ var/list/data = list()
+
+ data["broadcasting"] = broadcasting
+ data["listening"] = listening
+ data["frequency"] = frequency
+ data["freqlock"] = freqlock
+
+ var/list/radio_channels = list()
+
+ for(var/channel in channels)
+ var/channel_key = channel_to_prefix(channel)
+ radio_channels += list(list(
+ "name" = channel,
+ "status" = channels[channel] & FREQ_LISTENING,
+ "hotkey" = channel_key))
+
+ data["channels"] = radio_channels
+
+ data["command"] = volume
+ data["useCommand"] = use_volume
+ data["subspace"] = subspace_transmission
+ data["subspaceSwitchable"] = subspace_switchable
+ data["headset"] = FALSE
+
+ return data
+
+/obj/item/device/radio/listening_bug/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
+ switch(action)
+ if("listen")
+ if(prevent_snooping)
+ to_chat(usr, SPAN_WARNING("This device cannot receive transmissions!"))
+ return
+ listening = !listening
+ return
+ if("subspace")
+ if(!ishuman(usr))
+ return
+ var/mob/living/carbon/human/user = usr
+ if(!check_access(user.wear_id) && !check_access(user.get_active_hand()))
+ to_chat(user, SPAN_WARNING("You need an authenticated ID card to change this function!"))
+ return
+ if(subspace_switchable)
+ subspace_transmission = !subspace_transmission
+ var/initial_prevent = initial(prevent_snooping)
+ if(initial_prevent)
+ prevent_snooping = TRUE
+ if(!subspace_transmission)
+ prevent_snooping = FALSE
+ channels = list()
+ return
+ ..()
+
+/obj/item/device/radio/listening_bug/hear_talk(mob/M as mob, msg, verb = "says", datum/language/speaking = null)
+ var/processed_verb = "[SPAN_RED("\[LSTN [nametag]\]")] [verb]"
+ if(broadcasting)
+ if(get_dist(src, M) <= 7)
+ talk_into(M, msg,null,processed_verb,speaking)
+
+/obj/item/device/radio/listening_bug/afterattack(atom/target_atom, mob/user as mob, proximity)
+ if(!ready_to_disguise)
+ return ..()
+
+ var/obj/item/target_item = target_atom
+ if(!istype(target_item) || target_item.anchored || target_item.w_class >= SIZE_LARGE)
+ to_chat(user, SPAN_WARNING("You cannot disguise the listening device as this object."))
+ return FALSE
+
+ var/confirm = tgui_alert(user, "Are you sure you wish to disguise the listening device as '[target_item]'?", "Confirm Choice", list("Yes","No"), 20 SECONDS)
+ if(confirm != "Yes")
+ return FALSE
+
+ icon = target_item.icon
+ name = target_item.name
+ desc = target_item.desc
+ icon_state = target_item.icon_state
+ item_state = target_item.item_state
+ flags_equip_slot = target_item.flags_equip_slot
+ w_class = target_item.w_class
+ ready_to_disguise = FALSE
+ disguised = TRUE
+
+/obj/item/device/radio/listening_bug/get_examine_text(mob/user)
+ if(disguised)
+ . = list()
+ var/size
+ switch(w_class)
+ if(SIZE_TINY)
+ size = "tiny"
+ if(SIZE_SMALL)
+ size = "small"
+ if(SIZE_MEDIUM)
+ size = "normal-sized"
+ . += "This is a [blood_color ? blood_color != "#030303" ? "bloody " : "oil-stained " : ""][icon2html(src, user)][src.name]. It is a [size] item."
+ if(desc)
+ . += desc
+ if(desc_lore)
+ . += SPAN_NOTICE("This has an extended lore description.")
+ else
+ . = ..()
+ . += SPAN_INFO("[src] is set to frequency [get_bug_letter()].")
+ if(nametag != initial(nametag))
+ . += SPAN_INFO("[src]'s nametag is set to '[nametag]'")
+
+/obj/item/device/radio/listening_bug/verb/change_disguise()
+ set name = "Change Disguise"
+ set category = "Object"
+ set src in usr
+
+ if(usr.is_mob_incapacitated())
+ to_chat(usr, SPAN_WARNING("You cannot do this while incapacitated!"))
+ return FALSE
+
+ var/check = tgui_alert(usr, "Do you wish to change the disguise of this listening bug?", "Change Disguise?", list("Yes", "No"))
+ if(check != "Yes")
+ return FALSE
+ if(disguised)
+ var/remove_check = tgui_alert(usr, "Do you wish to remove the current disguise?", "Remove Disguise?", list("Yes","No"))
+ if(remove_check == "Yes")
+ icon = initial(icon)
+ name = initial(name)
+ desc = initial(desc)
+ icon_state = initial(icon_state)
+ item_state = initial(item_state)
+ flags_equip_slot = initial(flags_equip_slot)
+ w_class = initial(w_class)
+ disguised = FALSE
+ return TRUE
+
+ to_chat(usr, SPAN_HELPFUL("You can now change the disguise of the device by selecting a normal, or smaller, sized object."))
+ ready_to_disguise = TRUE
+ return TRUE
+
+/obj/item/device/radio/listening_bug/proc/get_bug_letter()
+ switch(frequency)
+ if(BUG_A_FREQ)
+ return "A"
+ if(BUG_B_FREQ)
+ return "B"
+ if(SEC_FREQ)
+ return "MP"
+ if(PVST_FREQ)
+ return "PVST"
+ if(HC_FREQ)
+ return "HC"
+ if(WY_FREQ, PMC_CCT_FREQ)
+ return "WY"
+ if(PMC_CMD_FREQ)
+ return "WYC"
+ if(UPP_CCT_FREQ, UPP_KDO_FREQ)
+ return "UPP"
+ else
+ return "X"
+
+#define OPTION_REMOVE "Remove Tag"
+#define OPTION_NEW "New Tag"
+
+/obj/item/device/radio/listening_bug/verb/set_nametag()
+ set name = "Set Nametag"
+ set category = "Object"
+ set src in usr
+
+ if(usr.is_mob_incapacitated())
+ to_chat(usr, SPAN_WARNING("You cannot do this while incapacitated!"))
+ return FALSE
+
+ var/check = tgui_alert(usr, "Do you wish to change the name tag of this listening bug?", "Change Name tag?", list("Yes", "No"))
+ if(check != "Yes")
+ return FALSE
+
+
+ var/new_nametag
+ var/remove
+ if(nametag != initial(nametag))
+ remove = tgui_alert(usr, "Do you wish to remove the current nametag?", "Remove Nametag", list("Yes", "No"))
+ if(remove == "Yes")
+ new_nametag = initial(nametag)
+ else
+ new_nametag = tgui_input_text(usr, "What new name tag do you wish to use?", "New Name", initial(nametag), 6)
+
+ if(!new_nametag || (new_nametag == nametag))
+ return FALSE
+
+ nametag = new_nametag
+ log_game("[key_name(usr)] set a listening device nametag to [new_nametag].")
+ return TRUE
+
+#undef OPTION_REMOVE
+#undef OPTION_NEW
+
+/obj/item/device/radio/listening_bug/freq_a
+ frequency = BUG_A_FREQ
+
+/obj/item/device/radio/listening_bug/freq_b
+ frequency = BUG_B_FREQ
+
+/obj/item/device/radio/listening_bug/radio_linked
+ prevent_snooping = TRUE
+ subspace_transmission = TRUE
+ subspace_switchable = TRUE
+
+/obj/item/device/radio/listening_bug/radio_linked/mp
+ frequency = SEC_FREQ
+ req_one_access = list(ACCESS_MARINE_BRIG)
+
+/obj/item/device/radio/listening_bug/radio_linked/hc
+ frequency = HC_FREQ
+ req_one_access = list(ACCESS_MARINE_CO)
+/obj/item/device/radio/listening_bug/radio_linked/hc/pvst
+ frequency = PVST_FREQ
+
+/obj/item/device/radio/listening_bug/radio_linked/wy
+ frequency = WY_FREQ
+ req_one_access = list(ACCESS_WY_EXEC, ACCESS_WY_SECURITY)
+
+/obj/item/device/radio/listening_bug/radio_linked/wy/pmc
+ frequency = PMC_CCT_FREQ
+ req_one_access = list(ACCESS_WY_EXEC, ACCESS_WY_SECURITY)
+
+/obj/item/device/radio/listening_bug/radio_linked/upp
+ frequency = UPP_CCT_FREQ
+ req_one_access = list(ACCESS_UPP_COMMANDO, ACCESS_UPP_SECURITY)
+
+/obj/item/device/radio/listening_bug/radio_linked/upp/commando
+ frequency = UPP_KDO_FREQ
+ req_one_access = list(ACCESS_UPP_COMMANDO)
+
+
+// ENCRYPTION KEYS FOR LISTENING IN!
+//REQURIES SUBSPACE ACTIVATION ON THE BUGS FIRST!
+/obj/item/device/encryptionkey/listening_bug
+ desc = "A small encryption key for listening to a secret broadcasting device! Unlikely to work if the device is not using subspace communications!"
+ icon_state = "stripped_key"
+
+/obj/item/device/encryptionkey/listening_bug/freq_a
+ name = "Listening Bug Encryption Key (A)"
+ channels = list(RADIO_CHANNEL_BUG_A = TRUE)
+
+/obj/item/device/encryptionkey/listening_bug/freq_b
+ name = "Listening Bug Encryption Key (B)"
+ channels = list(RADIO_CHANNEL_BUG_B = TRUE)
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 4a3afa00f368..8e4ffb90d2bd 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -761,3 +761,211 @@
else if(!isopened)
isopened = 1
icon_state = "mealpackopened"
+
+//food boxes for storage in bulk
+
+//meat
+/obj/item/storage/box/meat
+ name = "box of meat"
+
+/obj/item/storage/box/meat/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/meat/monkey(src)
+
+//fish
+/obj/item/storage/box/fish
+ name = "box of fish"
+
+/obj/item/storage/box/fish/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/carpmeat(src)
+
+//grocery
+
+//milk
+/obj/item/storage/box/milk
+ name = "box of milk"
+
+/obj/item/storage/box/milk/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/drinks/milk(src)
+
+//soymilk
+/obj/item/storage/box/soymilk
+ name = "box of soymilk"
+
+/obj/item/storage/box/soymilk/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/drinks/soymilk(src)
+
+//enzyme
+/obj/item/storage/box/enzyme
+ name = "box of enzyme"
+
+/obj/item/storage/box/enzyme/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/condiment/enzyme(src)
+
+//dry storage
+
+//flour
+/obj/item/storage/box/flour
+ name = "box of flour"
+
+/obj/item/storage/box/flour/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/flour(src)
+
+//sugar
+/obj/item/storage/box/sugar
+ name = "box of sugar"
+
+/obj/item/storage/box/sugar/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/condiment/sugar(src)
+
+//saltshaker
+/obj/item/storage/box/saltshaker
+ name = "box of saltshakers"
+
+/obj/item/storage/box/saltshaker/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/condiment/saltshaker(src)
+
+//peppermill
+/obj/item/storage/box/peppermill
+ name = "box of peppermills"
+
+/obj/item/storage/box/peppermill/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/condiment/peppermill(src)
+
+//mint
+/obj/item/storage/box/mint
+ name = "box of mints"
+
+/obj/item/storage/box/mint/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/mint(src)
+
+// ORGANICS
+
+//apple
+/obj/item/storage/box/apple
+ name = "box of apples"
+
+/obj/item/storage/box/apple/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/apple(src)
+
+//banana
+/obj/item/storage/box/banana
+ name = "box of bananas"
+
+/obj/item/storage/box/banana/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/banana(src)
+
+//chanterelle
+/obj/item/storage/box/chanterelles
+ name = "box of chanterelle"
+
+/obj/item/storage/box/chanterelle/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src)
+
+//cherries
+/obj/item/storage/box/cherries
+ name = "box of cherries"
+
+/obj/item/storage/box/cherries/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/cherries(src)
+
+//chili
+/obj/item/storage/box/chili
+ name = "box of chili"
+
+/obj/item/storage/box/chili/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/chili(src)
+
+//cabbage
+/obj/item/storage/box/cabbage
+ name = "box of cabbages"
+
+/obj/item/storage/box/cabbage/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/cabbage(src)
+
+//carrot
+/obj/item/storage/box/carrot
+ name = "box of carrots"
+
+/obj/item/storage/box/carrot/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/carrot(src)
+
+//corn
+/obj/item/storage/box/corn
+ name = "box of corn"
+
+/obj/item/storage/box/corn/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/corn(src)
+
+//eggplant
+/obj/item/storage/box/eggplant
+ name = "box of eggplants"
+
+/obj/item/storage/box/eggplant/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/eggplant(src)
+
+//lemon
+/obj/item/storage/box/lemon
+ name = "box of lemons"
+
+/obj/item/storage/box/lemon/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/lemon(src)
+
+//lime
+/obj/item/storage/box/lime
+ name = "box of limes"
+
+/obj/item/storage/box/lime/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/lime(src)
+
+//orange
+/obj/item/storage/box/orange
+ name = "box of oranges"
+
+/obj/item/storage/box/orange/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/orange(src)
+
+//potato
+/obj/item/storage/box/potato
+ name = "box of potatoes"
+
+/obj/item/storage/box/potato/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/potato(src)
+
+//tomato
+/obj/item/storage/box/tomato
+ name = "box of tomatoes"
+
+/obj/item/storage/box/tomato/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/tomato(src)
+
+//whitebeet
+/obj/item/storage/box/whitebeet
+ name = "box of whitebeet"
+
+/obj/item/storage/box/whitebeet/fill_preset_inventory()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_container/food/snacks/grown/whitebeet(src)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index d6148b23b7f0..2efd8e4e81e9 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -158,10 +158,15 @@
/obj/structure/closet/proc/take_damage(damage)
+ if(health <= 0)
+ return
+
health = max(health - damage, 0)
if(health <= 0)
- for(var/atom/movable/A as anything in src)
- A.forceMove(src.loc)
+ for(var/atom/movable/movable as anything in src)
+ if(!loc)
+ break
+ movable.forceMove(loc)
playsound(loc, 'sound/effects/meteorimpact.ogg', 25, 1)
qdel(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm
new file mode 100644
index 000000000000..d8b0c984d4b1
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm
@@ -0,0 +1,143 @@
+//standart fridge
+
+/obj/structure/closet/secure_closet/fridge
+ name = "Refrigerator"
+ icon = 'icons/obj/structures/machinery/kitchen.dmi'
+ icon_state = "fridge1"
+ icon_closed = "fridge"
+ icon_locked = "fridge1"
+ icon_opened = "fridgeopen"
+ icon_broken = "fridgebroken"
+ icon_off = "fridge1"
+ storage_capacity = 60 //give extra storage capacity so that everything can fit.
+
+/obj/structure/closet/secure_closet/fridge/update_icon()
+ if(broken)
+ icon_state = icon_broken
+ else
+ if(!opened)
+ if(locked)
+ icon_state = icon_locked
+ else
+ icon_state = icon_closed
+ else
+ icon_state = icon_opened
+
+// for almayer.
+
+// Kitchen preparation room small quantity out of boxes...
+
+//standart organic storage.
+
+/obj/structure/closet/secure_closet/fridge/organic
+ name = "Organic"
+
+/obj/structure/closet/secure_closet/fridge/organic/Initialize()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/reagent_container/food/snacks/grown/apple(src)
+ new /obj/item/reagent_container/food/snacks/grown/cabbage(src)
+ new /obj/item/reagent_container/food/snacks/grown/carrot(src)
+ new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src)
+ new /obj/item/reagent_container/food/snacks/grown/chili(src)
+ new /obj/item/reagent_container/food/snacks/grown/corn(src)
+ new /obj/item/reagent_container/food/snacks/grown/eggplant(src)
+ new /obj/item/reagent_container/food/snacks/grown/potato(src)
+ new /obj/item/reagent_container/food/snacks/grown/tomato(src)
+ new /obj/item/reagent_container/food/snacks/grown/whitebeet(src)
+ new /obj/item/reagent_container/food/snacks/grown/cherries(src)
+ new /obj/item/reagent_container/food/snacks/grown/lime(src)
+ new /obj/item/reagent_container/food/snacks/grown/lemon(src)
+ new /obj/item/reagent_container/food/snacks/grown/orange(src)
+ new /obj/item/reagent_container/food/snacks/grown/banana(src)
+
+//DRy
+
+/obj/structure/closet/secure_closet/fridge/dry
+ name = "dry"
+
+/obj/structure/closet/secure_closet/fridge/dry/Initialize()
+ . = ..()
+ for(var/i in 1 to 6)
+ new /obj/item/reagent_container/food/snacks/flour(src)
+ for(var/i in 1 to 2)
+ new /obj/item/reagent_container/food/condiment/sugar(src)
+
+//grocery
+
+/obj/structure/closet/secure_closet/fridge/groceries
+ name = "Groceries"
+
+/obj/structure/closet/secure_closet/fridge/groceries/Initialize()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/reagent_container/food/drinks/milk(src)
+ new /obj/item/reagent_container/food/drinks/soymilk(src)
+ new /obj/item/storage/fancy/egg_box(src)
+ new /obj/item/reagent_container/food/condiment/enzyme(src)
+
+// Kitchen Reserve big quantity stored in boxes
+
+//meat surplus
+/obj/structure/closet/secure_closet/fridge/meat/stock
+ name = "meat"
+
+/obj/structure/closet/secure_closet/fridge/meat/stock/Initialize()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/storage/box/meat(src)
+
+//fish surplus
+/obj/structure/closet/secure_closet/fridge/fish/stock
+ name = "fish"
+
+/obj/structure/closet/secure_closet/fridge/fish/stock/Initialize()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/storage/box/fish(src)
+
+//groceries to hold milk in bulk
+/obj/structure/closet/secure_closet/fridge/groceries/stock
+ name = "Groceries"
+
+/obj/structure/closet/secure_closet/fridge/groceries/stock/Initialize()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/storage/box/milk(src)
+ new /obj/item/storage/box/soymilk(src)
+ for(var/i in 1 to 7)
+ new /obj/item/storage/fancy/egg_box(src)
+ new /obj/item/storage/box/enzyme(src)
+
+//dry storage for dry food only... not a fridge
+/obj/structure/closet/secure_closet/fridge/dry/stock
+ name = "dry"
+
+/obj/structure/closet/secure_closet/fridge/dry/stock/Initialize()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/storage/box/flour(src)
+ new /obj/item/storage/box/sugar(src)
+
+// organic storage in bulk
+
+/obj/structure/closet/secure_closet/fridge/organic/stock
+ name = "Organic"
+
+/obj/structure/closet/secure_closet/fridge/organic/stock/Initialize()
+ . = ..()
+ new /obj/item/storage/box/apple(src)
+ new /obj/item/storage/box/banana(src)
+ new /obj/item/storage/box/chanterelle(src)
+ new /obj/item/storage/box/cherries(src)
+ new /obj/item/storage/box/chili(src)
+ new /obj/item/storage/box/cabbage(src)
+ new /obj/item/storage/box/carrot(src)
+ new /obj/item/storage/box/corn(src)
+ new /obj/item/storage/box/eggplant(src)
+ new /obj/item/storage/box/lemon(src)
+ new /obj/item/storage/box/lime(src)
+ new /obj/item/storage/box/orange(src)
+ new /obj/item/storage/box/potato(src)
+ new /obj/item/storage/box/tomato(src)
+ new /obj/item/storage/box/whitebeet(src)
diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm
index 437f203c5fbb..303a9a7655e8 100644
--- a/code/game/turfs/walls/walls.dm
+++ b/code/game/turfs/walls/walls.dm
@@ -88,8 +88,6 @@
if(istype(found_object, /obj/structure/sign/poster))
var/obj/structure/sign/poster/found_poster = found_object
found_poster.roll_and_drop(src)
- if(istype(found_object, /obj/effect/alien/weeds))
- qdel(found_object)
var/list/turf/cardinal_neighbors = list(get_step(src, NORTH), get_step(src, SOUTH), get_step(src, EAST), get_step(src, WEST))
for(var/turf/cardinal_turf as anything in cardinal_neighbors)
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index cb9bb98d339d..300c999b885b 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -315,7 +315,9 @@
log_debug("not atom! [item]")
continue
- if (sprites[icon_file])
+ var/imgid = replacetext(replacetext("[k]", "/obj/item/", ""), "/", "-")
+
+ if(sprites[imgid])
continue
if(icon_state in icon_states(icon_file))
@@ -339,7 +341,6 @@
item = new k()
I = icon(item.icon, item.icon_state, SOUTH)
qdel(item)
- var/imgid = replacetext(replacetext("[k]", "/obj/item/", ""), "/", "-")
Insert(imgid, I)
return ..()
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index 8a46e60956db..a71f7dbcb3e9 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -161,14 +161,14 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "USCM balaclava, tan"
path = /obj/item/clothing/mask/rebreather/scarf/tan
-/datum/gear/skull_balaclava_blue
- display_name = "Blue Skull Balaclava"
+/datum/gear/mask/uscm/skull_balaclava_blue
+ display_name = "USCM balaclava, blue skull"
path = /obj/item/clothing/mask/rebreather/skull
cost = 4 //same as skull facepaint
slot = WEAR_FACE
-/datum/gear/skull_balaclava_black
- display_name = "Black Skull Balaclava"
+/datum/gear/mask/uscm/skull_balaclava_black
+ display_name = "USCM balaclava, black skull"
path = /obj/item/clothing/mask/rebreather/skull/black
cost = 4
slot = WEAR_FACE
@@ -888,8 +888,8 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "Facepaint, black"
path = /obj/item/facepaint/black
-/datum/gear/skullfacepaint
- display_name = "Skull Facepaint"
+/datum/gear/misc/facepaint_skull
+ display_name = "Facepaint, skull"
path = /obj/item/facepaint/skull
cost = 3
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 4eafeed6c378..d6596474885c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -48,6 +48,11 @@
return
..()
+/obj/item/clothing/hear_talk(mob/M, msg)
+ for(var/obj/item/clothing/accessory/attached in accessories)
+ attached.hear_talk(M, msg)
+ ..()
+
/obj/item/clothing/proc/get_armor(armortype)
var/armor_total = 0
var/armor_count = 0
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 1c2fb2a9f29d..54e9d91576f1 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -299,3 +299,21 @@
name = "liaison's winter coat"
desc = "A Weyland-Yutani winter coat. Only the best comfort for the liaison in a cold environment."
icon_state = "snowsuit_liaison"
+
+/obj/item/clothing/suit/storage/snow_suit/liaison/modified
+ name = "modified liaison's winter coat"
+ desc = "A Weyland-Yutani winter coat. This one has been modified to holster guns and other objects. Only the best comfort and utility for the liaison surviving in a cold, hostile environment."
+ allowed = list(
+ /obj/item/weapon/gun,
+ /obj/item/tank/emergency_oxygen,
+ /obj/item/device/flashlight,
+ /obj/item/ammo_magazine,
+ /obj/item/explosive/grenade,
+ /obj/item/device/binoculars,
+ /obj/item/attachable/bayonet,
+ /obj/item/storage/large_holster/machete,
+ /obj/item/weapon/baseballbat,
+ /obj/item/weapon/baseballbat/metal,
+ /obj/item/device/motiondetector,
+ /obj/item/device/walkman,
+ )
diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm
index ce0be7c0c8a1..eda9803c8784 100644
--- a/code/modules/cm_aliens/structures/egg.dm
+++ b/code/modules/cm_aliens/structures/egg.dm
@@ -355,4 +355,8 @@ SPECIAL EGG USED BY EGG CARRIER
/obj/effect/alien/egg/carrier_egg/Burst(kill, instant_trigger, mob/living/carbon/xenomorph/X, is_hugger_player_controlled)
. = ..()
- owner = null
+ if(owner)
+ var/datum/behavior_delegate/carrier_eggsac/behavior = owner.behavior_delegate
+ behavior.remove_egg_owner(src)
+ if(life_timer)
+ deltimer(life_timer)
diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm
index b3ec6c800c68..00f956fdd4ed 100644
--- a/code/modules/cm_marines/equipment/gear.dm
+++ b/code/modules/cm_marines/equipment/gear.dm
@@ -149,15 +149,6 @@
return FALSE
. = ..()
handle_cloaking()
-
-/obj/item/coin/marine
- name = "marine specialist weapon token"
- desc = "Insert this into a specialist vendor in order to access a single highly dangerous weapon."
- icon_state = "coin_platinum"
-
-/obj/item/coin/marine/attackby(obj/item/W as obj, mob/user as mob) //To remove attaching a string functionality
- return
-
/obj/structure/broken_apc
name = "\improper M577 armored personnel carrier"
desc = "A large, armored behemoth capable of ferrying marines around. \nThis one is sitting nonfunctional."
diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
index 342f9a775718..d99da8f59f2c 100644
--- a/code/modules/cm_marines/equipment/kit_boxes.dm
+++ b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -165,9 +165,13 @@
var/squad_assignment_update = TRUE
//this one is delivered via ASRS as a reward for DEFCON/techwebs/whatever else we will have
-/obj/item/spec_kit/asrs
+/obj/item/spec_kit/rifleman
+ squad_assignment_update = FALSE
allowed_roles_list = list(JOB_SQUAD_MARINE, JOB_WO_SQUAD_MARINE)
+/obj/item/spec_kit/rifleman/jobless
+ allowed_roles_list = list()
+
/obj/item/spec_kit/cryo
squad_assignment_update = FALSE
@@ -212,6 +216,17 @@
return FALSE
return TRUE
+/obj/item/spec_kit/rifleman/can_use(mob/living/carbon/human/user)
+ if(!length(allowed_roles_list))
+ return TRUE
+
+ for(var/allowed_role in allowed_roles_list)
+ if(user.job == allowed_role)//Alternate check to normal kit as this is distributed to people without SKILL_SPEC_TRAINED.
+ if(skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_KITTED) && !skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL))
+ to_chat(user, SPAN_WARNING("You already have specialization, give this kit to someone else!"))
+ return FALSE
+ return TRUE
+
/obj/item/spec_kit/proc/select_and_spawn(mob/living/carbon/human/user)
var/selection = tgui_input_list(user, "Pick your specialist equipment type.", "Specialist Kit Selection", GLOB.available_specialist_kit_boxes)
if(!selection || QDELETED(src))
diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm
index 8b6dde5527e2..01183ebceca5 100644
--- a/code/modules/cm_marines/smartgun_mount.dm
+++ b/code/modules/cm_marines/smartgun_mount.dm
@@ -1,12 +1,6 @@
//////////////////////////////////////////////////////////////
//Mounted MG, Replacment for the current jury rig code.
-//Adds a coin for engi vendors
-/obj/item/coin/marine/engineer
- name = "marine engineer support token"
- desc = "Insert this into an engineer vendor in order to access a support weapon."
- icon_state = "coin_platinum"
-
// First thing we need is the ammo drum for this thing.
/obj/item/ammo_magazine/m56d
name = "M56D drum magazine (10x28mm Caseless)"
diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm
index 532b422a13a9..f53f25326b69 100644
--- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm
+++ b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm
@@ -1,6 +1,6 @@
/datum/equipment_preset/survivor/engineer/soro
- name = "Survivor - Sorokyne Strata Political Prisioner"
- assignment = "Sorokyne Strata Political Prisioner"
+ name = "Survivor - Sorokyne Strata Political Prisoner"
+ assignment = "Sorokyne Strata Political Prisoner"
/datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY)
@@ -58,3 +58,17 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
..()
+
+/datum/equipment_preset/survivor/corporate/soro
+ name = "Survivor - Sorokyne Strata Corporate Liaison"
+ assignment = "Sorokyne Strata Corporate Liaison"
+
+/datum/equipment_preset/survivor/corporate/soro/load_gear(mob/living/carbon/human/new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/charcoal(new_human), WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/liaison/modified(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+ ..()
+
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index 5f7c40c016e0..12db6323ac40 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -303,6 +303,9 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 887313eb4db9..430f959a7718 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -758,12 +758,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!tx || !ty || !tz)
return
following = null
- spawn(0)
- // To stop the ghost flickering.
- x = tx
- y = ty
- z = tz
- sleep(15)
+ forceMove(locate(tx, ty, tz))
/mob/dead/observer/verb/dead_teleport_mob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 06e404a43555..5fe27c5e5167 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -65,7 +65,7 @@
var/is_admin = FALSE
if(user && user.client)
- is_admin = check_other_rights(user.client, R_ADMIN, FALSE)
+ is_admin = check_client_rights(user.client, R_ADMIN, FALSE)
var/list/pois = getpois(skip_mindless = !is_admin, specify_dead_role = FALSE)
for(var/name in pois)
var/list/serialized = list()
diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
index 0a6e0ff2ca26..cb46b3c6cc26 100644
--- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
@@ -75,6 +75,7 @@
X.tunnel_delay = 1
addtimer(CALLBACK(src, PROC_REF(cooldown_end)), 4 MINUTES)
var/msg = strip_html(input("Add a description to the tunnel:", "Tunnel Description") as text|null)
+ msg = replace_non_alphanumeric_plus(msg)
var/description
if(msg)
description = msg
diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
index 63aa7b09a633..af6be8265cc0 100644
--- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
@@ -26,8 +26,15 @@
if(!length(castes_available))
to_chat(src, SPAN_WARNING("The Hive is not capable of supporting any castes you can evolve to yet."))
return
+ var/castepick
+ if((client.prefs && client.prefs.no_radials_preference) || !hive.evolution_menu_images)
+ castepick = tgui_input_list(usr, "You are growing into a beautiful alien! It is time to choose a caste.", "Evolve", castes_available, theme="hive_status")
+ else
+ var/list/fancy_caste_list = list()
+ for(var/caste in castes_available)
+ fancy_caste_list[caste] = hive.evolution_menu_images[caste]
- var/castepick = tgui_input_list(usr, "You are growing into a beautiful alien! It is time to choose a caste.", "Evolve", castes_available, theme="hive_status")
+ castepick = show_radial_menu(src, src.client?.eye, fancy_caste_list)
if(!castepick) //Changed my mind
return
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
index cf3be6de9086..cc0065733e21 100644
--- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -347,157 +347,158 @@
var/atom/movable/vis_obj/xeno_wounds/wound_icon_holder
var/atom/movable/vis_obj/xeno_pack/backpack_icon_holder
-/mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/oldXeno, h_number)
- var/area/A = get_area(src)
- if(A && A.statistic_exempt)
- statistic_exempt = TRUE
+/mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/old_xeno, hivenumber)
+
+ if(old_xeno && old_xeno.hivenumber)
+ src.hivenumber = old_xeno.hivenumber
+ else if(hivenumber)
+ src.hivenumber = hivenumber
+
+ var/datum/hive_status/hive = GLOB.hive_datum[src.hivenumber]
+
+ if(hive)
+ hive.add_xeno(src)
wound_icon_holder = new(null, src)
vis_contents += wound_icon_holder
- if(oldXeno)
- set_movement_intent(oldXeno.m_intent)
- hivenumber = oldXeno.hivenumber
- nicknumber = oldXeno.nicknumber
- life_kills_total = oldXeno.life_kills_total
- life_damage_taken_total = oldXeno.life_damage_taken_total
- evolution_stored = oldXeno.evolution_stored
- if(oldXeno.iff_tag)
- iff_tag = oldXeno.iff_tag
- iff_tag.forceMove(src)
- oldXeno.iff_tag = null
- else if (h_number)
- hivenumber = h_number
-
set_languages(list(LANGUAGE_XENOMORPH, LANGUAGE_HIVEMIND))
- if(oldXeno)
- for(var/datum/language/L in oldXeno.languages)
- add_language(L.name)//Make sure to keep languages (mostly for event Queens that know English)
- // Well, not yet, technically
- var/datum/hive_status/in_hive = GLOB.hive_datum[hivenumber]
- if(in_hive)
- in_hive.add_xeno(src)
- // But now we are!
+ ///Handle transferring things from the old Xeno if we have one in the case of evolve, devolve etc.
+ if(old_xeno)
+ src.nicknumber = old_xeno.nicknumber
+ src.life_kills_total = old_xeno.life_kills_total
+ src.life_damage_taken_total = old_xeno.life_damage_taken_total
+ src.evolution_stored = old_xeno.evolution_stored
- for(var/T in in_hive.hive_inherant_traits)
- ADD_TRAIT(src, T, TRAIT_SOURCE_HIVE)
+ for(var/datum/language/language as anything in old_xeno.languages)
+ add_language(language.name)//Make sure to keep languages (mostly for event Queens that know English)
+
+ //Carry over intents & targeted limb to the new Xeno
+ set_movement_intent(old_xeno.m_intent)
+ a_intent_change(old_xeno.a_intent)
+
+ //We are hiding, let's keep hiding if we can!
+ if(old_xeno.layer == XENO_HIDING_LAYER)
+ for(var/datum/action/xeno_action/onclick/xenohide/hide in actions)
+ layer = XENO_HIDING_LAYER
+ hide.button.icon_state = "template_active"
+
+ //If we're holding things drop them
+ for(var/obj/item/item in old_xeno.contents) //Drop stuff
+ old_xeno.drop_inv_item_on_ground(item)
+ old_xeno.empty_gut()
+
+ if(old_xeno.iff_tag)
+ iff_tag = old_xeno.iff_tag
+ iff_tag.forceMove(src)
+ old_xeno.iff_tag = null
+
+ if(hive)
+ for(var/trait in hive.hive_inherant_traits)
+ ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE)
mutators.xeno = src
+ //Set caste stuff
if(caste_type && GLOB.xeno_datum_list[caste_type])
caste = GLOB.xeno_datum_list[caste_type]
- else
- to_world("something went very wrong")
- return
- update_icon_source()
+ //Fire immunity signals
+ if (caste.fire_immunity != FIRE_IMMUNITY_NONE)
+ if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE)
+ RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune))
- acid_splash_cooldown = caste.acid_splash_cooldown
+ RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_crossed_immune))
+ else
+ UnregisterSignal(src, list(
+ COMSIG_LIVING_PREIGNITION,
+ COMSIG_LIVING_FLAMER_CROSSED,
+ COMSIG_LIVING_FLAMER_FLAMED
+ ))
- if (caste.fire_immunity != FIRE_IMMUNITY_NONE)
- if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE)
- RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune))
- RegisterSignal(src, list(
- COMSIG_LIVING_FLAMER_CROSSED,
- COMSIG_LIVING_FLAMER_FLAMED,
- ), PROC_REF(flamer_crossed_immune))
- else
- UnregisterSignal(src, list(
- COMSIG_LIVING_PREIGNITION,
- COMSIG_LIVING_FLAMER_CROSSED,
- COMSIG_LIVING_FLAMER_FLAMED,
- ))
+ if(caste.spit_types && length(caste.spit_types))
+ ammo = GLOB.ammo_list[caste.spit_types[1]]
- recalculate_everything()
+ acid_splash_cooldown = caste.acid_splash_cooldown
+
+ if(caste.adjust_size_x != 1)
+ var/matrix/matrix = matrix()
+ matrix.Scale(caste.adjust_size_x, caste.adjust_size_y)
+ apply_transform(matrix)
+
+ behavior_delegate = new caste.behavior_delegate_type()
+ behavior_delegate.bound_xeno = src
+ behavior_delegate.add_to_xeno()
+ resin_build_order = caste.resin_build_order
+
+ job = caste.caste_type // Used for tracking the caste playtime
+
+ else
+ CRASH("Attempted to create a new xenomorph [src] without caste datum.")
if(mob_size < MOB_SIZE_BIG)
mob_flags |= SQUEEZE_UNDER_VEHICLES
+ // More setup stuff for names, abilities etc
+ update_icon_source()
generate_name()
+ add_inherent_verbs()
+ add_abilities()
+ create_reagents(100)
+ regenerate_icons()
- if(isqueen(src))
- SStracking.set_leader("hive_[hivenumber]", src)
- SStracking.start_tracking("hive_[hivenumber]", src)
+ toggle_xeno_hostilehud()
+ recalculate_everything()
+ toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks
. = ..()
+
+ //Set leader to the new mob
+ if(old_xeno && hive && IS_XENO_LEADER(old_xeno))
+ hive.replace_hive_leader(old_xeno, src)
+
+ //Begin SStracking
+ SStracking.start_tracking("hive_[src.hivenumber]", src)
+
+ GLOB.living_xeno_list += src
+ GLOB.xeno_mob_list += src
+
//WO GAMEMODE
if(SSticker?.mode?.hardcore)
hardcore = 1 //Prevents healing and queen evolution
time_of_birth = world.time
- add_inherent_verbs()
- add_abilities()
- recalculate_actions()
-
+ //Minimap
if(z)
INVOKE_NEXT_TICK(src, PROC_REF(add_minimap_marker))
+ //Sight
sight |= SEE_MOBS
see_invisible = SEE_INVISIBLE_LIVING
see_in_dark = 12
+
if(client)
set_lighting_alpha_from_prefs(client)
else
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- if(caste && caste.spit_types && caste.spit_types.len)
- ammo = GLOB.ammo_list[caste.spit_types[1]]
-
- create_reagents(100)
-
- GLOB.living_xeno_list += src
- GLOB.xeno_mob_list += src
-
- if(caste && caste.adjust_size_x != 1)
- var/matrix/M = matrix()
- M.Scale(caste.adjust_size_x, caste.adjust_size_y)
- apply_transform(M)
-
- if(caste)
- behavior_delegate = new caste.behavior_delegate_type()
- behavior_delegate.bound_xeno = src
- behavior_delegate.add_to_xeno()
- resin_build_order = caste.resin_build_order
- else
- CRASH("Xenomorph [src] has no caste datum! Tell the devs!")
-
- regenerate_icons()
- toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks
- toggle_xeno_hostilehud()
-
- if(oldXeno)
- a_intent_change(oldXeno.a_intent)//Keep intent
-
- if(oldXeno.layer == XENO_HIDING_LAYER)
- //We are hiding, let's keep hiding if we can!
- for(var/datum/action/xeno_action/onclick/xenohide/hide in actions)
- if(istype(hide))
- layer = XENO_HIDING_LAYER
- hide.button.icon_state = "template_active"
-
- for(var/obj/item/W in oldXeno.contents) //Drop stuff
- oldXeno.drop_inv_item_on_ground(W)
-
- oldXeno.empty_gut()
-
- if(IS_XENO_LEADER(oldXeno))
- hive.replace_hive_leader(oldXeno, src)
-
// Only handle free slots if the xeno is not in tdome
- if(!is_admin_level(z))
+ if(hive && !is_admin_level(z))
var/selected_caste = GLOB.xeno_datum_list[caste_type]?.type
hive.used_slots[selected_caste]++
+ //Statistics
+ var/area/current_area = get_area(src)
+ if(current_area && current_area.statistic_exempt)
+ statistic_exempt = TRUE
if(GLOB.round_statistics && !statistic_exempt)
GLOB.round_statistics.track_new_participant(faction, 1)
- generate_name()
// This can happen if a xeno gets made before the game starts
if (hive && hive.hive_ui)
hive.hive_ui.update_all_xeno_data()
- job = caste.caste_type // Used for tracking the caste playtime
Decorate()
RegisterSignal(src, COMSIG_MOB_SCREECH_ACT, PROC_REF(handle_screech_act))
@@ -551,22 +552,16 @@
if(caste.fire_immunity & FIRE_IMMUNITY_XENO_FRENZY)
. |= COMPONENT_XENO_FRENZY
+//Off-load this proc so it can be called freely
+//Since Xenos change names like they change shoes, we need somewhere to hammer in all those legos
+//We set their name first, then update their real_name AND their mind name
//Off-load this proc so it can be called freely
//Since Xenos change names like they change shoes, we need somewhere to hammer in all those legos
//We set their name first, then update their real_name AND their mind name
/mob/living/carbon/xenomorph/proc/generate_name()
//We don't have a nicknumber yet, assign one to stick with us
if(!nicknumber)
- var/tempnumber = rand(1, 999)
- var/list/numberlist = list()
- for(var/mob/living/carbon/xenomorph/X in GLOB.xeno_mob_list)
- numberlist += X.nicknumber
-
- while(tempnumber in numberlist)
- tempnumber = rand(1, 999)
-
- nicknumber = tempnumber
-
+ generate_and_set_nicknumber()
// Even if we don't have the hive datum we usually still have the hive number
var/datum/hive_status/in_hive = hive
if(!in_hive)
@@ -575,12 +570,10 @@
//Im putting this in here, because this proc gets called when a player inhabits a SSD xeno and it needs to go somewhere (sorry)
hud_set_marks()
- handle_name(in_hive)
-
-/mob/living/carbon/xenomorph/proc/handle_name(datum/hive_status/in_hive)
var/name_prefix = in_hive.prefix
var/name_client_prefix = ""
var/name_client_postfix = ""
+ var/number_decorator = ""
if(client)
name_client_prefix = "[(client.xeno_prefix||client.xeno_postfix) ? client.xeno_prefix : "XX"]-"
name_client_postfix = client.xeno_postfix ? ("-"+client.xeno_postfix) : ""
@@ -591,9 +584,12 @@
var/age_display = show_age_prefix ? age_prefix : ""
var/name_display = ""
+ // Rare easter egg
+ if(nicknumber == 666)
+ number_decorator = "Infernal "
if(show_name_numbers)
name_display = show_only_numbers ? " ([nicknumber])" : " ([name_client_prefix][nicknumber][name_client_postfix])"
- name = "[name_prefix][age_display][caste.display_name || caste.caste_type][name_display]"
+ name = "[name_prefix][number_decorator][age_display][caste.display_name || caste.caste_type][name_display]"
//Update linked data so they show up properly
change_real_name(src, name)
@@ -813,23 +809,17 @@
/mob/living/carbon/xenomorph/proc/set_hive_and_update(new_hivenumber = XENO_HIVE_NORMAL)
var/datum/hive_status/new_hive = GLOB.hive_datum[new_hivenumber]
if(!new_hive)
- return
+ return FALSE
- for(var/T in _status_traits) // They can't keep getting away with this!!!
- REMOVE_TRAIT(src, T, TRAIT_SOURCE_HIVE)
+ for(var/trait in _status_traits) // They can't keep getting away with this!!!
+ REMOVE_TRAIT(src, trait, TRAIT_SOURCE_HIVE)
new_hive.add_xeno(src)
- for(var/T in new_hive.hive_inherant_traits)
- ADD_TRAIT(src, T, TRAIT_SOURCE_HIVE)
+ for(var/trait in new_hive.hive_inherant_traits)
+ ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE)
- if(istype(src, /mob/living/carbon/xenomorph/larva))
- var/mob/living/carbon/xenomorph/larva/L = src
- L.update_icons() // larva renaming done differently
- else
- generate_name()
- if(istype(src, /mob/living/carbon/xenomorph/queen))
- update_living_queens()
+ generate_name()
lock_evolve = FALSE
banished = FALSE
@@ -840,6 +830,9 @@
// Update the hive status UI
new_hive.hive_ui.update_all_xeno_data()
+ return TRUE
+
+
//*********************************************************//
//********************Mutator functions********************//
//*********************************************************//
@@ -1112,3 +1105,16 @@
. = ..()
if(!resting) // !resting because we dont wanna prematurely update wounds if they're just trying to rest
update_wounds()
+
+///Generate a new unused nicknumber for the current hive, if hive doesn't exist return 0
+/mob/living/carbon/xenomorph/proc/generate_and_set_nicknumber()
+ if(!hive)
+ //If hive doesn't exist make it 0
+ nicknumber = 0
+ return
+ var/datum/hive_status/hive_status = hive
+ if(length(hive_status.available_nicknumbers))
+ nicknumber = pick_n_take(hive_status.available_nicknumbers)
+ else
+ //If we somehow use all 999 numbers fallback on 0
+ nicknumber = 0
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
index 6a2071fafc3b..3276705ce9b7 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
@@ -177,6 +177,7 @@
return
var/new_name = strip_html(input("Change the description of the tunnel:", "Tunnel Description") as text|null)
+ new_name = replace_non_alphanumeric_plus(new_name)
if(new_name)
new_name = "[new_name] ([get_area_name(T)])"
log_admin("[key_name(src)] has renamed the tunnel \"[T.tunnel_desc]\" as \"[new_name]\".")
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 94c0110fc68f..74a46a30e9ba 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
@@ -570,6 +570,13 @@
to_chat(X, SPAN_XENOWARNING("You can only shape on weeds. Find some resin before you start building!"))
return FALSE
+ // This snowflake check exists because stairs specifically are indestructable, tile-covering, and cannot be moved, which allows resin holes to be
+ // planted under them without any possible counterplay. In the future if resin holes stop being able to be hidden under objects, remove this check.
+ var/obj/structure/stairs/staircase = locate() in src
+ if(staircase)
+ to_chat(X, SPAN_XENOWARNING("You cannot make a hole beneath a staircase!"))
+ return FALSE
+
if(alien_weeds.linked_hive.hivenumber != X.hivenumber)
to_chat(X, SPAN_XENOWARNING("These weeds don't belong to your hive!"))
return FALSE
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
index 816e6020c30f..6d5c6699b929 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
@@ -50,15 +50,22 @@
var/burrowable = TRUE //Can it be safely burrowed if it has no player?
var/state_override
+ var/is_bloody = TRUE //We're still "bloody"
icon_xeno = 'icons/mob/xenos/larva.dmi'
icon_xenonid = 'icons/mob/xenonids/larva.dmi'
-/mob/living/carbon/xenomorph/larva/initialize_pass_flags(datum/pass_flags_container/PF)
+/mob/living/carbon/xenomorph/larva/Life()
+ if(is_bloody && (evolution_stored >= evolution_threshold / 2)) //We're no longer bloody so update our name...
+ generate_name()
+ is_bloody = FALSE
+ return ..()
+
+/mob/living/carbon/xenomorph/larva/initialize_pass_flags(datum/pass_flags_container/pass_flags)
..()
- if (PF)
- PF.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER
- PF.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM
+ if (pass_flags)
+ pass_flags.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER
+ pass_flags.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM
/mob/living/carbon/xenomorph/larva/corrupted
hivenumber = XENO_HIVE_CORRUPTED
@@ -101,29 +108,10 @@
//Larva code is just a mess, so let's get it over with
/mob/living/carbon/xenomorph/larva/update_icons()
- var/progress = "" //Naming convention, three different names
var/state = "" //Icon convention, two different sprite sets
- var/name_prefix = ""
-
- if(hive)
- name_prefix = hive.prefix
- color = hive.color
-
- if(evolution_stored >= evolution_threshold)
- progress = "Mature "
- else if(evolution_stored < evolution_threshold / 2) //We're still bloody
- progress = "Bloody "
+ if(evolution_stored < evolution_threshold / 2) //We're still bloody
state = "Bloody "
- else
- progress = ""
-
- name = "[name_prefix][progress]Larva ([nicknumber])"
-
- if(istype(src,/mob/living/carbon/xenomorph/larva/predalien)) state = "Predalien " //Sort of a hack.
-
- //Update linked data so they show up properly
- change_real_name(src, name)
if(stat == DEAD)
icon_state = "[state_override || state]Larva Dead"
@@ -141,16 +129,13 @@
/mob/living/carbon/xenomorph/larva/alter_ghost(mob/dead/observer/ghost)
ghost.icon_state = "[caste.caste_type]"
-/mob/living/carbon/xenomorph/larva/handle_name()
- return
-
/mob/living/carbon/xenomorph/larva/start_pulling(atom/movable/AM)
return
/mob/living/carbon/xenomorph/larva/pull_response(mob/puller)
return TRUE
-/mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/A, proximity, click_parameters, tile_attack, ignores_resin = FALSE)
+/mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/atom, proximity, click_parameters, tile_attack, ignores_resin = FALSE)
a_intent = INTENT_HELP //Forces help intent for all interactions.
if(!caste)
return FALSE
@@ -158,21 +143,50 @@
if(body_position) //No attacks while laying down
return FALSE
- A.attack_larva(src)
+ atom.attack_larva(src)
xeno_attack_delay(src) //Adds some lag to the 'attack'
-/proc/spawn_hivenumber_larva(atom/A, hivenumber)
- if(!GLOB.hive_datum[hivenumber] || isnull(A))
+/proc/spawn_hivenumber_larva(atom/atom, hivenumber)
+ if(!GLOB.hive_datum[hivenumber] || isnull(atom))
return
- var/mob/living/carbon/xenomorph/larva/L = new /mob/living/carbon/xenomorph/larva(A)
+ var/mob/living/carbon/xenomorph/larva/larva = new /mob/living/carbon/xenomorph/larva(atom)
- L.set_hive_and_update(hivenumber)
+ larva.set_hive_and_update(hivenumber)
- return L
+ return larva
/mob/living/carbon/xenomorph/larva/emote(act, m_type, message, intentional, force_silence)
playsound(loc, "alien_roar_larva", 15)
/mob/living/carbon/xenomorph/larva/is_xeno_grabbable()
return TRUE
+
+/*
+Larva name generation, set nicknumber = (number between 1 & 999) which isn't taken by any other xenos in GLOB.xeno_mob_list if doesn't already exist.
+Also handles the "Mature / Bloody naming convention. Call this to update the name."
+*/
+/mob/living/carbon/xenomorph/larva/generate_name()
+ if(!nicknumber)
+ generate_and_set_nicknumber()
+
+ var/progress = "" //Naming convention, three different names
+ var/name_prefix = "" // Prefix for hive
+
+ if(hive)
+ name_prefix = hive.prefix
+ color = hive.color
+
+ if(evolution_stored >= evolution_threshold)
+ progress = "Mature "
+ else if(evolution_stored < evolution_threshold / 2) //We're still bloody
+ progress = "Bloody "
+
+ name = "[name_prefix][progress]Larva ([nicknumber])"
+
+ //Update linked data so they show up properly
+ change_real_name(src, name)
+ //Update the hive status UI
+ if(hive)
+ var/datum/hive_status/hive_status = hive
+ hive_status.hive_ui.update_xeno_info()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index e6f4dfae8a44..63802d5023c2 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -389,6 +389,7 @@
/mob/living/carbon/xenomorph/queen/Initialize()
. = ..()
+ SStracking.set_leader("hive_[hivenumber]", src)
if(!is_admin_level(z))//so admins can safely spawn Queens in Thunderdome for tests.
xeno_message(SPAN_XENOANNOUNCE("A new Queen has risen to lead the Hive! Rejoice!"),3,hivenumber)
notify_ghosts(header = "New Queen", message = "A new Queen has risen.", source = src, action = NOTIFY_ORBIT)
@@ -409,8 +410,10 @@
AddComponent(/datum/component/footstep, 2 , 35, 11, 4, "alien_footstep_large")
-/mob/living/carbon/xenomorph/queen/handle_name(datum/hive_status/in_hive)
- var/name_prefix = in_hive.prefix
+/mob/living/carbon/xenomorph/queen/generate_name()
+ if(!nicknumber)
+ generate_and_set_nicknumber()
+ var/name_prefix = hive.prefix
if(queen_aged)
age_xeno()
switch(age)
@@ -439,11 +442,16 @@
name_client_prefix = "[(client.xeno_prefix||client.xeno_postfix) ? client.xeno_prefix : "XX"]-"
name_client_postfix = client.xeno_postfix ? ("-"+client.xeno_postfix) : ""
full_designation = "[name_client_prefix][nicknumber][name_client_postfix]"
- color = in_hive.color
+ color = hive.color
//Update linked data so they show up properly
change_real_name(src, name)
+/mob/living/carbon/xenomorph/queen/set_hive_and_update(new_hivenumber)
+ if(!..())
+ return FALSE
+ update_living_queens()
+
/mob/living/carbon/xenomorph/queen/proc/make_combat_effective()
queen_aged = TRUE
diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
index 05d456d0025d..b9304b33b15a 100644
--- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm
+++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
@@ -122,7 +122,7 @@
var/obj/effect/alien/egg/newegg
if(weed.weed_strength >= WEED_LEVEL_HIVE)
newegg = new /obj/effect/alien/egg(T, hivenumber)
- else if(weed.weed_strength == WEED_LEVEL_STANDARD)
+ else if(weed.weed_strength >= WEED_LEVEL_STANDARD)
newegg = new /obj/effect/alien/egg/carrier_egg(T,hivenumber, user)
else
to_chat(user, SPAN_XENOWARNING("[src] can't be planted on these weeds."))
diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
index 3d032da2fe36..3b321ca259c9 100644
--- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
+++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm
@@ -63,9 +63,10 @@
/datum/behavior_delegate/carrier_eggsac/on_life()
if(length(eggs_sustained) > egg_sustain_cap)
var/obj/effect/alien/egg/carrier_egg/my_egg = eggs_sustained[1]
- remove_egg_owner(my_egg)
- my_egg.start_unstoppable_decay()
- to_chat(bound_xeno, SPAN_XENOWARNING("You can only sustain [egg_sustain_cap] eggs off hive weeds! Your oldest placed egg is decaying rapidly."))
+ if(my_egg)
+ remove_egg_owner(my_egg)
+ my_egg.start_unstoppable_decay()
+ to_chat(bound_xeno, SPAN_XENOWARNING("You can only sustain [egg_sustain_cap] eggs off hive weeds! Your oldest placed egg is decaying rapidly."))
for(var/obj/effect/alien/egg/carrier_egg/my_egg as anything in eggs_sustained)
//Get the distance from us to our sustained egg
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index 810c8f58666b..a5da9763047d 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -365,6 +365,15 @@
var/datum/tacmap/drawing/xeno/tacmap
var/minimap_type = MINIMAP_FLAG_XENO
+ var/list/available_nicknumbers = list()
+
+ /*Stores the image()'s for the xeno evolution radial menu
+ To add an image for your caste - add an icon to icons/mob/xenos/radial_xenos.dmi
+ Icon size should be 32x32, to make them fit within the radial menu border size your icon 22x22 and leave 10px transparent border.
+ The name of the icon should be the same as the XENO_CASTE_ define for that caste eg. #define XENO_CASTE_DRONE "Drone"
+ */
+ var/static/list/evolution_menu_images
+
/datum/hive_status/New()
mutators.hive = src
hive_ui = new(src)
@@ -374,11 +383,22 @@
tacmap = new(src, minimap_type)
if(!internal_faction)
internal_faction = name
+ for(var/number in 1 to 999)
+ available_nicknumbers += number
if(hivenumber != XENO_HIVE_NORMAL)
return
+ if(!evolution_menu_images)
+ evolution_menu_images = list()
+ generate_evo_menu_images()
+
RegisterSignal(SSdcs, COMSIG_GLOB_POST_SETUP, PROC_REF(post_setup))
+///Generate the image()'s requried for the evolution radial menu.
+/datum/hive_status/proc/generate_evo_menu_images()
+ for(var/datum/caste_datum/caste as anything in subtypesof(/datum/caste_datum))
+ evolution_menu_images[initial(caste.caste_type)] = image('icons/mob/xenos/radial_xenos.dmi', initial(caste.caste_type))
+
/datum/hive_status/proc/post_setup()
SIGNAL_HANDLER
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 36ae23587a28..9fa38d1ecb43 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -118,6 +118,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
listening += M
hearturfs += M.locs[1]
for(var/obj/O in M.contents)
+ var/obj/item/clothing/worn_item = O
+ if((O.flags_atom & USES_HEARING) || ((istype(worn_item) && worn_item.accessories)))
+ listening_obj |= O
+ else if(istype(I, /obj/structure/surface))
+ var/obj/structure/surface/table = I
+ hearturfs += table.locs[1]
+ for(var/obj/O in table.contents)
if(O.flags_atom & USES_HEARING)
listening_obj |= O
else if(istype(I, /obj/))
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 258132a112e1..b572b5d9e87b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -569,6 +569,10 @@
name = "crumpled note"
info = "there is cotten candy in the walls"
+/obj/item/paper/bigred/lambda
+ name = "ripped diary entry"
+ info = "Director Smith's Diary\nEntry Date: 15 December 2181\nToday, I've felt true progress! The XX-121 reproduction program is in full effect, and Administrator Cooper have given us the all clear to continue producing specimens. To think that all this is coming from just that first specimen, a single 'Queen' form... It's grown to almost 5 meters tall and shows no signs of ceasing egg production! These creatures will be the next Synthetic of our time, we'll show those Seegson bastards."
+
/obj/item/paper/bigred/union
name = "Shaft miners union"
info = "Today we have had enough of being underpaid and treated like shit for not reaching the higher up's unreasonable quotas of ore. They say this place has a \"sea of valuable ores,\" yet we have been mining for years and are yet to find a single diamond. We have had it, enough is enough. They think they can control everything we do, they thought wrong! We, the oppressed workers, shall rise up against the capitalist dogs in a mutiny and take back our pay by force. \n If they send their dogs here to bust us, we will kill each and every single one of them."
diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index 0e56efe7ab5d..18fb0bf44cd8 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -375,29 +375,6 @@
. = ..()
set_fire_delay(FIRE_DELAY_TIER_7)
-GLOBAL_LIST_EMPTY(flamer_particles)
-/particles/flamer_fire
- icon = 'icons/effects/particles/fire.dmi'
- icon_state = "bonfire"
- width = 100
- height = 100
- count = 1000
- spawning = 8
- lifespan = 0.7 SECONDS
- fade = 1 SECONDS
- grow = -0.01
- velocity = list(0, 0)
- position = generator("box", list(-16, -16), list(16, 16), NORMAL_RAND)
- drift = generator("vector", list(0, -0.2), list(0, 0.2))
- gravity = list(0, 0.95)
- scale = generator("vector", list(0.3, 0.3), list(1,1), NORMAL_RAND)
- rotation = 30
- spin = generator("num", -20, 20)
-
-/particles/flamer_fire/New(set_color)
- ..()
- color = set_color
-
/obj/flamer_fire
name = "fire"
desc = "Ouch!"
@@ -454,10 +431,6 @@ GLOBAL_LIST_EMPTY(flamer_particles)
set_light(l_color = R.burncolor)
- if(!GLOB.flamer_particles[R.burncolor])
- GLOB.flamer_particles[R.burncolor] = new /particles/flamer_fire(R.burncolor)
- particles = GLOB.flamer_particles[R.burncolor]
-
tied_reagent = new R.type() // Can't get deleted this way
tied_reagent.make_alike(R)
diff --git a/colonialmarines.dme b/colonialmarines.dme
index d632d6bd4998..16b54d55aa98 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -1090,6 +1090,7 @@
#include "code\game\objects\items\devices\radio\encryptionkey.dm"
#include "code\game\objects\items\devices\radio\headset.dm"
#include "code\game\objects\items\devices\radio\intercom.dm"
+#include "code\game\objects\items\devices\radio\listening_bugs.dm"
#include "code\game\objects\items\devices\radio\radio.dm"
#include "code\game\objects\items\explosives\explosive.dm"
#include "code\game\objects\items\explosives\mine.dm"
@@ -1289,6 +1290,7 @@
#include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
+#include "code\game\objects\structures\crates_lockers\closets\secure\kitchen.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
diff --git a/html/changelogs/AutoChangeLog-pr-4942.yml b/html/changelogs/AutoChangeLog-pr-4942.yml
new file mode 100644
index 000000000000..910b59085760
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4942.yml
@@ -0,0 +1,6 @@
+author: "IowaPotatoFarmer"
+delete-after: True
+changes:
+ - rscadd: "Added a Corporate Liaison survivor to Sorokyne."
+ - rscadd: "Added a modified version of the liaison's winter coat that allows it to holster guns and a few other things. Only available to the Sorokyne Strata Corporate Liaison for now."
+ - spellcheck: "Fixed a typo in the Sorokyne Strata Political Prisoner's ID tag."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5022.yml b/html/changelogs/AutoChangeLog-pr-5022.yml
new file mode 100644
index 000000000000..389b3f533380
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5022.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+ - rscadd: "Radial Menu for xeno Evolve"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5062.yml b/html/changelogs/AutoChangeLog-pr-5062.yml
new file mode 100644
index 000000000000..f733828f0911
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5062.yml
@@ -0,0 +1,4 @@
+author: "ihatethisengine"
+delete-after: True
+changes:
+ - rscadd: "Whiskey outpost is voteable less often and requires 140 players."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5066.yml b/html/changelogs/AutoChangeLog-pr-5066.yml
new file mode 100644
index 000000000000..96ab60a4bbf4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5066.yml
@@ -0,0 +1,6 @@
+author: "realforest2001"
+delete-after: True
+changes:
+ - bugfix: "Fixes /spec_kit/asrs (now /spec_kit/rifleman) not allowing use."
+ - code_imp: "Adds back-end functionality for token redeeming on cm_vending vendors, and moves synth experimental tools token to use it."
+ - rscadd: "Spec tokens are real."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5084.yml b/html/changelogs/AutoChangeLog-pr-5084.yml
new file mode 100644
index 000000000000..2ace834670e5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5084.yml
@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+ - bugfix: "fixed a runtime in /datum/component/healing_reduction/process(delta_time)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5095.yml b/html/changelogs/AutoChangeLog-pr-5095.yml
new file mode 100644
index 000000000000..8ed12b90778d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5095.yml
@@ -0,0 +1,4 @@
+author: "MrDas"
+delete-after: True
+changes:
+ - bugfix: "Observer minimap should no longer occasionally show wrong / no map."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5096.yml b/html/changelogs/AutoChangeLog-pr-5096.yml
new file mode 100644
index 000000000000..7384ce62d666
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5096.yml
@@ -0,0 +1,4 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+ - bugfix: "Upgraded resin walls can now nest hosts.\n/🆑"
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
index 6bd90cf1578e..02e7bf43396b 100644
--- a/html/changelogs/archive/2023-11.yml
+++ b/html/changelogs/archive/2023-11.yml
@@ -402,3 +402,24 @@
than if lying down.
stalkerino:
- rscadd: readds skull facepaint and skull balaclava (blue and black)
+2023-11-29:
+ realforest2001:
+ - rscdel: Whiskey Outpost no longer rolls pred rounds naturally.
+2023-11-30:
+ Birdtalon:
+ - code_imp: Refactiors xenomorph initialize & removes some duplicate proc calls
+ HeresKozmos:
+ - mapadd: added a new spring area to kutjevo's south caves
+ Huffie56:
+ - rscadd: Added a lot's of food boxes for that hold the basic ingredients for cooking.
+ - rscadd: Added a file to handle the fridges in almayer kitchen.
+ - rscadd: Added a vendor in the kitchen that sell boxes of ingredients.
+ - rscadd: Added a a food crate called surplus boxes ingredient containing random
+ boxes of ingredients.
+ - rscadd: Added a version of this crate that will be freely given via the ASR system.
+ SabreML:
+ - bugfix: Fixed a few space tiles under a window in Kutjevo Refinery.
+ harryob:
+ - bugfix: the health indicator in the tooltip and colorbox is still present when
+ a POI has 0 health
+ - bugfix: admins can refresh the orbit menu without runtimes
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
new file mode 100644
index 000000000000..a481ce6987cd
--- /dev/null
+++ b/html/changelogs/archive/2023-12.yml
@@ -0,0 +1,40 @@
+2023-12-01:
+ Birdtalon:
+ - bugfix: Eggsac fragile eggs can be placed on hardy weeds.
+ Morrow:
+ - rscdel: Removed flame particles. Possibly increases performance for some players.
+ Zonespace27:
+ - bugfix: Resin holes can no longer be planted below stairs
+2023-12-02:
+ 567Turtle:
+ - rscadd: Brown boots and gloves are now vendable from the surplus vendors.
+ Birdtalon:
+ - rscadd: '"Infernal" name prefix for xeno who rolls number 666'
+ - code_imp: Refactors xeno name generation. Larva name generation and removes some
+ istype(src)
+ - bugfix: 'Restricts burrower tunnels to alphanumeric characters as some other characters
+ break the tunnel.
+
+ code; Adds new proc to replace non alphanumeric or space characters.'
+ Morrow:
+ - code_imp: Corrected a check to avoid repeat work in /datum/asset/spritesheet/vending_products/register()
+ realforest2001:
+ - rscadd: Added disguisable listening bugs/devices. MPs have two outside CMP office,
+ the CL has two in their bedroom.
+ - bugfix: Fixes incorrect frequencies being used to display channel names on radios.
+ - bugfix: Radios and tape recorders placed on tables or placed inside webbing can
+ now hear speech again.
+2023-12-03:
+ BadAtThisGame302:
+ - rscadd: Added a flavor diary entry from the Director of Lambda
+ - mapadd: added back the old vault nightmare insert on Solaris which was removed
+ due to the creation of static comms where it spawned
+ - maptweak: tweaked the Lambda Director's Office
+ - maptweak: tweaked the Lambda Administration Office
+ - maptweak: tweaked the Lambda Relaxation Room
+ SpartanBobby:
+ - maptweak: Redetails Almayer Squad briefing rooms
+ blackdragonTOW:
+ - maptweak: Standardized the names of LZs to include the name of the LZ.
+ stalkerino:
+ - bugfix: fixes the skull facepaint, black mask, blue mask
diff --git a/icons/mob/xenos/radial_xenos.dmi b/icons/mob/xenos/radial_xenos.dmi
new file mode 100644
index 000000000000..2832f42fda33
Binary files /dev/null and b/icons/mob/xenos/radial_xenos.dmi differ
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 2cdf06d411c7..6a90f35e4de3 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -119,7 +119,7 @@
/area/bigredv2/outside/space_port)
"aau" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Communications Landing Zone"
+ name = "LZ1: Communications Landing Zone"
},
/turf/open/floor/plating,
/area/bigredv2/outside/space_port)
@@ -2548,7 +2548,8 @@
"ahv" = (
/obj/structure/surface/table/holotable/wood,
/obj/item/paper_bin,
-/turf/open/floor/wood,
+/obj/item/tool/pen/clicky,
+/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"ahw" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -3147,6 +3148,15 @@
/area/bigredv2/outside/marshal_office)
"ajd" = (
/obj/structure/surface/table/holotable/wood,
+/obj/structure/transmitter/colony_net/rotary{
+ phone_category = "Lambda Labs";
+ phone_color = "blue";
+ phone_id = "Administration"
+ },
+/obj/item/clothing/mask/cigarette{
+ pixel_x = 5;
+ pixel_y = 6
+ },
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"aje" = (
@@ -3198,7 +3208,8 @@
/area/bigredv2/outside/dorms)
"ajm" = (
/obj/structure/filingcabinet,
-/obj/effect/landmark/objective_landmark/science,
+/obj/effect/landmark/objective_landmark/close,
+/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
"ajn" = (
@@ -3410,8 +3421,8 @@
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
"ajO" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/tool/pen,
+/obj/structure/machinery/prop/almayer/computer/PC,
+/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"ajP" = (
@@ -3501,8 +3512,8 @@
},
/area/bigredv2/outside/nw)
"aka" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/landmark/objective_landmark/close,
+/obj/structure/machinery/faxmachine,
+/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
"akc" = (
@@ -4484,16 +4495,14 @@
/turf/open/floor/plating,
/area/bigredv2/outside/dorms)
"amW" = (
-/obj/structure/machinery/door_control{
- id = "safe_room";
- layer = 4;
- name = "Door Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = -5;
- req_access_txt = "7";
- specialfunctions = 4
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/closet/crate/freezer/rations,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "elevatorshaft"
},
-/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/lambda/breakroom)
"amX" = (
/obj/structure/window/framed/solaris/reinforced,
@@ -5896,9 +5905,13 @@
},
/area/bigredv2/outside/general_offices)
"aqX" = (
-/obj/structure/closet/crate/freezer/rations,
/obj/item/storage/toolbox/mechanical,
/obj/item/device/multitool,
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/obj/structure/surface/rack,
/turf/open/floor{
dir = 1;
icon_state = "elevatorshaft"
@@ -5914,8 +5927,15 @@
},
/area/bigredv2/caves/lambda/breakroom)
"aqZ" = (
-/obj/structure/closet/fireaxecabinet{
- pixel_y = 32
+/obj/structure/noticeboard{
+ dir = 1;
+ pixel_y = 30;
+ desc = "A board for pinning important items upon.";
+ name = "trophy board"
+ },
+/obj/item/XenoBio/Chitin{
+ pixel_y = 27;
+ anchored = 1
},
/turf/open/floor{
dir = 1;
@@ -5923,8 +5943,11 @@
},
/area/bigredv2/caves/lambda/breakroom)
"ara" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/device/flashlight/lamp,
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/device/flashlight/lamp{
+ pixel_y = 15
+ },
+/obj/item/paper/bigred/lambda,
/turf/open/floor{
dir = 1;
icon_state = "elevatorshaft"
@@ -6141,9 +6164,7 @@
/obj/item/ammo_magazine/shotgun/incendiary,
/obj/item/ammo_magazine/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/combat,
-/obj/structure/window/reinforced{
- dir = 1
- },
+/obj/structure/machinery/door/window/eastleft,
/turf/open/floor{
dir = 1;
icon_state = "elevatorshaft"
@@ -6157,7 +6178,7 @@
/area/bigredv2/caves/lambda/breakroom)
"arG" = (
/obj/structure/bed,
-/obj/item/bedsheet/captain,
+/obj/item/bedsheet/rd,
/turf/open/floor{
dir = 1;
icon_state = "elevatorshaft"
@@ -6387,8 +6408,9 @@
/area/bigredv2/outside/ne)
"asn" = (
/obj/structure/surface/rack,
-/obj/structure/window/reinforced,
/obj/item/clothing/suit/armor/vest,
+/obj/structure/machinery/door/window/eastright,
+/obj/structure/window/reinforced,
/turf/open/floor{
dir = 1;
icon_state = "elevatorshaft"
@@ -6405,9 +6427,7 @@
},
/area/bigredv2/caves/lambda/breakroom)
"asp" = (
-/obj/structure/bed/chair/office/light{
- dir = 4
- },
+/obj/structure/bed/chair/comfy/black,
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
"asq" = (
@@ -6417,7 +6437,7 @@
},
/area/bigredv2/outside/medical)
"asr" = (
-/obj/structure/bed/chair{
+/obj/structure/bed/chair/comfy{
dir = 8
},
/turf/open/floor/carpet,
@@ -6690,9 +6710,12 @@
/area/bigredv2/outside/chapel)
"ate" = (
/obj/structure/machinery/door_control{
- id = "safe_blast";
- name = "Blast Door";
- pixel_y = -25
+ id = "safe_room";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -28;
+ req_access_txt = "106";
+ specialfunctions = 4
},
/turf/open/floor{
dir = 1;
@@ -6700,12 +6723,8 @@
},
/area/bigredv2/caves/lambda/breakroom)
"atf" = (
-/obj/structure/closet/crate/medical,
-/obj/item/storage/firstaid/adv,
-/obj/item/storage/firstaid/o2,
-/obj/item/storage/firstaid/toxin,
-/obj/item/storage/firstaid/rad,
-/obj/effect/landmark/objective_landmark/medium,
+/obj/structure/closet/secure_closet/RD,
+/obj/effect/landmark/objective_landmark/science,
/turf/open/floor{
dir = 1;
icon_state = "elevatorshaft"
@@ -6918,7 +6937,7 @@
dir = 1;
icon_state = "door_locked";
id = "safe_room";
- name = "\improper Lambda Lab Secure Storage"
+ name = "\improper Lambda Lab Director's Safe Room"
},
/turf/open/floor{
icon_state = "delivery"
@@ -7145,7 +7164,7 @@
/area/bigredv2/outside/office_complex)
"aum" = (
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
- name = "\improper Lambda Lab Administration Office"
+ name = "\improper Lambda Lab Director's Office"
},
/turf/open/floor{
icon_state = "delivery"
@@ -7718,7 +7737,6 @@
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
"avN" = (
-/obj/structure/bed/chair,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
@@ -7982,8 +8000,19 @@
/turf/open/mars,
/area/bigredv2/outside/ne)
"awz" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/XenoBio/Chitin,
+/obj/item/ashtray/bronze{
+ pixel_x = -7
+ },
+/obj/item/trash/cigbutt,
+/obj/item/trash/cigbutt{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 14
+ },
+/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"awA" = (
@@ -7998,13 +8027,12 @@
},
/area/bigredv2/caves/lambda/research)
"awB" = (
-/obj/structure/surface/table/holotable/wood,
-/obj/item/reagent_container/food/drinks/coffee,
/obj/structure/transmitter/colony_net/rotary{
phone_category = "Lambda Labs";
phone_color = "blue";
- phone_id = "Administration"
+ phone_id = "Director"
},
+/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"awC" = (
@@ -8253,10 +8281,10 @@
},
/area/bigredv2/caves/lambda/virology)
"axo" = (
-/obj/structure/bed/chair/office/light{
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/structure/bed/chair/comfy/black{
dir = 8
},
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
"axp" = (
@@ -8711,6 +8739,12 @@
/area/bigredv2/caves/lambda/breakroom)
"ayB" = (
/obj/structure/machinery/light,
+/obj/structure/surface/table/woodentable,
+/obj/item/storage/fancy/cigarettes/wypacket{
+ pixel_x = -5;
+ pixel_y = 4
+ },
+/obj/item/tool/lighter/zippo,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"ayC" = (
@@ -10831,8 +10865,10 @@
},
/area/bigredv2/caves/lambda/research)
"aEs" = (
-/obj/structure/surface/table/holotable/wood,
-/turf/open/floor/wood,
+/obj/structure/bed/chair/comfy/lime{
+ dir = 8
+ },
+/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
"aEt" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -11491,9 +11527,7 @@
},
/area/bigredv2/caves/lambda/research)
"aGh" = (
-/obj/structure/bed/chair/office/light{
- dir = 1
- },
+/obj/structure/filingcabinet/filingcabinet,
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
"aGi" = (
@@ -19537,7 +19571,7 @@
/turf/open/floor,
/area/bigredv2/outside/cargo)
"bcy" = (
-/obj/structure/machinery/vending/cigarette,
+/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor,
/area/bigredv2/outside/cargo)
"bcz" = (
@@ -21454,7 +21488,7 @@
/area/bigredv2/outside/space_port_lz2)
"biI" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "Engineering Landing Zone"
+ name = "LZ2: Engineering Landing Zone"
},
/turf/open/floor/plating,
/area/bigredv2/outside/space_port_lz2)
@@ -29670,6 +29704,10 @@
icon_state = "darkyellowcorners2"
},
/area/bigredv2/caves/eta/living)
+"fnv" = (
+/obj/structure/bed/chair/comfy,
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
"fnO" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
@@ -30300,7 +30338,7 @@
do_not_disturb = 1;
phone_category = "Lambda Labs";
phone_color = "red";
- phone_id = "Secure Storage";
+ phone_id = "Director's Safe Room";
pixel_x = -18
},
/turf/open/floor{
@@ -30986,7 +31024,7 @@
},
/area/bigredv2/outside/lambda_cave_cas)
"hSP" = (
-/obj/structure/machinery/vending/cigarette,
+/obj/structure/machinery/vending/cigarette/colony,
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
@@ -32672,6 +32710,12 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
+"kIF" = (
+/obj/structure/bed/chair/comfy/orange{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
"kIW" = (
/obj/structure/fence,
/turf/open/floor{
@@ -33067,6 +33111,12 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves)
+"lAF" = (
+/obj/item/paper_bin,
+/obj/item/tool/pen,
+/obj/structure/surface/table/woodentable/fancy,
+/turf/open/floor/wood,
+/area/bigredv2/caves/lambda/breakroom)
"lAK" = (
/obj/effect/landmark/static_comms/net_two,
/turf/open/floor{
@@ -34629,6 +34679,10 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/research)
+"orT" = (
+/obj/structure/machinery/vending/coffee,
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
"orZ" = (
/obj/structure/closet/secure_closet/atmos_personal,
/obj/effect/landmark/objective_landmark/medium,
@@ -36192,6 +36246,12 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
+"reL" = (
+/obj/effect/landmark/nightmare{
+ insert_tag = "vault_v2"
+ },
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"rfe" = (
/obj/structure/platform/kutjevo/rock{
dir = 8
@@ -36653,6 +36713,17 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"rUs" = (
+/obj/structure/machinery/door_control{
+ id = "safe_room";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 28;
+ req_access_txt = "106";
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/bigredv2/caves/lambda/breakroom)
"rUN" = (
/obj/structure/platform{
dir = 4
@@ -37316,6 +37387,10 @@
icon_state = "mars_cave_19"
},
/area/bigredv2/outside/lz2_south_cas)
+"sUQ" = (
+/obj/structure/machinery/photocopier,
+/turf/open/floor/wood,
+/area/bigredv2/caves/lambda/breakroom)
"sWa" = (
/obj/item/ore{
pixel_x = 12;
@@ -39478,6 +39553,10 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"wCs" = (
+/obj/structure/machinery/vending/cigarette/colony,
+/turf/open/floor/carpet,
+/area/bigredv2/caves/lambda/breakroom)
"wDa" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 6
@@ -76696,9 +76775,9 @@ asn
gvI
amk
ajm
-aqc
+sUQ
avM
-aqc
+lAF
aka
amk
tQw
@@ -76914,9 +76993,9 @@ atc
amk
auj
auY
-auY
+fnv
awz
-ahv
+aqc
amk
aao
tQw
@@ -77341,14 +77420,14 @@ adZ
afd
afd
adZ
-aqY
+amW
arF
arF
ate
-amW
-aqc
-auY
+amk
+rUs
auY
+fnv
awB
aqc
amk
@@ -78001,7 +78080,7 @@ agd
agd
amX
awC
-axp
+kIF
axp
ayA
amk
@@ -78220,7 +78299,7 @@ avO
auY
aqc
axT
-auY
+wCs
amk
anI
aAM
@@ -78437,7 +78516,7 @@ auy
auY
aqc
aqc
-auY
+orT
amk
anI
aAN
@@ -78652,8 +78731,8 @@ agd
agd
amX
awD
-auY
-auY
+aEs
+aEs
ayB
amk
anI
@@ -78859,8 +78938,8 @@ adZ
anQ
amK
adZ
-aEs
-aGh
+sUQ
+aqc
aqc
asp
aqc
@@ -79077,7 +79156,7 @@ anR
amM
adZ
adZ
-aqc
+aGh
ahv
ajd
aqc
@@ -79295,7 +79374,7 @@ anS
apv
adZ
adZ
-aqc
+auY
asr
aqc
amX
@@ -82127,7 +82206,7 @@ aao
aao
jgW
aig
-aao
+reL
aao
anI
anI
diff --git a/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm b/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm
index 566f892d6fdd..f62f085e7ea2 100644
--- a/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm
+++ b/maps/map_files/BigRed/sprinkles/25.vault_v2.dmm
@@ -1,508 +1,652 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
-/turf/open/mars,
-/area/bigredv2/outside/c)
+/obj/structure/inflatable/popped/door,
+/obj/effect/decal/cleanable/blood/drip{
+ pixel_x = -11;
+ pixel_y = 10
+ },
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"ab" = (
-/turf/open/mars{
- icon_state = "mars_dirt_8"
+/obj/effect/decal/cleanable/blood/drip{
+ pixel_y = 6
},
-/area/bigredv2/outside/c)
+/turf/open/floor{
+ dir = 4;
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"ac" = (
+/obj/item/tool/pickaxe/drill,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+ icon_state = "mars_cave_2"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
"ad" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/c)
+/obj/effect/glowshroom,
+/turf/open/mars_cave,
+/area/bigredv2/caves_lambda)
"ae" = (
-/turf/open/mars{
- icon_state = "mars_dirt_3"
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_7"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
"af" = (
-/obj/effect/landmark/crap_item,
-/turf/open/mars,
-/area/bigredv2/outside/c)
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_7"
+ },
+/area/bigredv2/caves_lambda)
"ag" = (
-/turf/open/mars{
- icon_state = "mars_dirt_9"
+/obj/structure/barricade/wooden,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "darkpurplecorners2"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves/lambda/breakroom)
"ah" = (
-/turf/open/mars{
- icon_state = "mars_dirt_13"
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_10"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
"ai" = (
-/turf/open/mars{
- icon_state = "mars_dirt_10"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_6"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
"aj" = (
-/turf/open/mars{
- icon_state = "mars_dirt_14"
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_11"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/caves_lambda)
"ak" = (
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"al" = (
+/obj/structure/sign/safety/restrictedarea{
+ pixel_x = 8;
+ pixel_y = -32
+ },
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+ dir = 4;
+ icon_state = "darkpurplecorners2"
},
-/area/bigredv2/outside/c)
-"al" = (
-/turf/closed/wall/solaris/reinforced,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
"am" = (
-/obj/structure/largecrate/hunter_games_guns/mediocre,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/machinery/door_control{
+ id = "sci_br";
+ name = "Observation Shutters";
+ pixel_y = 28
+ },
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"an" = (
-/obj/structure/largecrate/supply/floodlights,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/effect/decal/cleanable/mucus,
+/obj/structure/machinery/door_control{
+ id = "sci_br";
+ name = "Observation Shutters";
+ pixel_y = 28
+ },
+/obj/effect/landmark/corpsespawner/pmc,
+/obj/effect/decal/cleanable/vomit,
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"ao" = (
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/effect/decal/cleanable/blood/drip{
+ pixel_x = -8;
+ pixel_y = 6
+ },
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"ap" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/technology_scanner,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/sign/safety/bulkhead_door,
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/caves/lambda/breakroom)
"aq" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/power/apc{
- dir = 1
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "w-y0"
},
-/obj/effect/spawner/random/powercell,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
"ar" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 1
+/obj/structure/filingcabinet{
+ density = 0;
+ layer = 3.1;
+ pixel_x = 8;
+ pixel_y = 18
+ },
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = -8;
+ pixel_y = 20
+ },
+/turf/open/floor/strata{
+ dir = 4;
+ icon_state = "white_cyan1"
},
-/obj/effect/spawner/random/tech_supply,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
"as" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/tool,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/filingcabinet{
+ pixel_x = 7
+ },
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = -7;
+ pixel_y = 19
+ },
+/obj/structure/filingcabinet{
+ pixel_x = -9
+ },
+/turf/open/floor/strata{
+ dir = 4;
+ icon_state = "white_cyan1"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"at" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/tech_supply,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/open/floor/plating/almayer,
+/area/bigredv2/caves/lambda/breakroom)
"au" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/open/floor/strata{
+ dir = 4;
+ icon_state = "white_cyan1"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"av" = (
-/obj/structure/surface/table,
-/obj/item/tool/extinguisher,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = 8;
+ pixel_y = 20
+ },
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = -8;
+ pixel_y = 16
+ },
+/turf/open/floor/strata{
+ dir = 4;
+ icon_state = "white_cyan1"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"aw" = (
-/obj/structure/largecrate/supply/generator,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/inflatable/popped/door,
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"ax" = (
-/obj/structure/largecrate/random/secure,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aA" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
},
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
+"aA" = (
+/turf/template_noop,
+/area/template_noop)
"aB" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4;
- layer = 2.4
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "w-y1"
},
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
"aC" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/obj/structure/machinery/light,
+/turf/open/floor{
dir = 4;
- layer = 2.4
- },
-/obj/structure/machinery/door/airlock/almayer/secure/colony{
- icon_state = "door_locked";
- locked = 0;
- name = "\improper Emergency Vault"
+ icon_state = "darkpurplecorners2"
},
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/area/bigredv2/caves/lambda/breakroom)
"aD" = (
-/obj/structure/largecrate/supply/supplies/water,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/inflatable/popped/door,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"aE" = (
-/obj/structure/largecrate/random,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/open/floor{
+ dir = 4;
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"aF" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/machinery/door/window/brigdoor/southright,
+/obj/item/clothing/accessory/medal/gold{
+ pixel_x = 7;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/medal/bronze/science{
+ pixel_x = -5
+ },
+/turf/open/floor/strata{
+ dir = 4;
+ icon_state = "white_cyan1"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"aG" = (
-/obj/structure/largecrate/supply/medicine/medkits,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/window/framed/solaris/reinforced,
+/obj/structure/machinery/door/poddoor/almayer{
+ id = "sci_br";
+ name = "\improper Lambda Observation Shutters"
+ },
+/turf/open/floor/plating,
+/area/bigredv2/caves/lambda/breakroom)
"aH" = (
-/obj/structure/largecrate/supply/medicine/blood,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/structure/barricade/wooden{
+ dir = 1;
+ pixel_y = 7
+ },
+/turf/open/floor{
+ icon_state = "darkpurplecorners2"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"aI" = (
-/obj/structure/largecrate/supply/medicine/iv,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/caves/lambda/breakroom)
"aJ" = (
/obj/structure/machinery/light,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aK" = (
-/obj/structure/pipes/vents/pump{
- dir = 1
- },
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aL" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light,
-/obj/effect/spawner/random/powercell,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
-"aM" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/turf/open/floor/strata{
dir = 4;
- layer = 2.4
+ icon_state = "white_cyan1"
},
-/turf/open/floor{
- icon_state = "asteroidwarning"
+/area/bigredv2/caves/lambda/breakroom)
+"aK" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/door_control{
+ id = "vault";
+ name = "Vault Lockdown"
},
-/area/bigredv2/outside/s)
-"aN" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/turf/open/floor/strata{
dir = 4;
- layer = 2.4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "white_cyan1"
},
-/area/bigredv2/outside/s)
-"aO" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 1
+/area/bigredv2/caves/lambda/breakroom)
+"aL" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/spacecash/c1000,
+/obj/item/spacecash/c1000,
+/obj/item/spacecash/c1000,
+/obj/item/spacecash/c1000,
+/turf/open/floor/strata{
+ dir = 4;
+ icon_state = "white_cyan1"
},
-/turf/open/floor{
+/area/bigredv2/caves/lambda/breakroom)
+"aM" = (
+/turf/open/floor/almayer{
dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "w-y2"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves/lambda/breakroom)
+"aN" = (
+/turf/open/mars_cave,
+/area/bigredv2/caves_lambda)
"aP" = (
-/turf/open/mars{
- icon_state = "mars_dirt_3"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_7"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aQ" = (
/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+ icon_state = "mars_cave_18"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aR" = (
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = 8;
+ pixel_y = 19
},
-/area/bigredv2/outside/s)
-"aS" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = -9;
+ pixel_y = 20
+ },
+/turf/open/floor/strata{
dir = 4;
- icon_state = "asteroidwarning"
+ icon_state = "white_cyan1"
+ },
+/area/bigredv2/caves/lambda/breakroom)
+"aS" = (
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aT" = (
-/turf/open/mars,
-/area/bigredv2/outside/s)
-"aU" = (
-/turf/open/mars{
- icon_state = "mars_dirt_11"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_4"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aV" = (
-/turf/open/mars{
- icon_state = "mars_dirt_9"
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aW" = (
-/turf/open/mars{
- icon_state = "mars_dirt_8"
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced/colony{
+ icon_state = "door_locked"
},
-/area/bigredv2/outside/s)
+/obj/structure/machinery/door/poddoor/almayer/closed{
+ dir = 4;
+ id = "vault";
+ name = "Vault Lockdown"
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/caves/lambda/breakroom)
"aX" = (
-/turf/open/mars{
- icon_state = "mars_dirt_10"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_8"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aY" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_10"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"aZ" = (
-/turf/open/mars{
- icon_state = "mars_dirt_12"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_5"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/caves_lambda)
"ba" = (
-/obj/effect/landmark/crap_item,
-/turf/open/mars,
-/area/bigredv2/outside/s)
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/caves_lambda)
+"vm" = (
+/obj/item/shard{
+ icon_state = "small"
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_18"
+ },
+/area/bigredv2/caves_lambda)
"zP" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/technology_scanner,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/storage)
+/obj/effect/glowshroom,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_5"
+ },
+/area/bigredv2/caves_lambda)
+"EW" = (
+/obj/structure/machinery/door/poddoor/almayer{
+ id = "sci_br";
+ name = "\improper Lambda Observation Shutters"
+ },
+/obj/item/shard{
+ icon_state = "medium"
+ },
+/obj/structure/window_frame/solaris/reinforced,
+/turf/open/floor/plating,
+/area/bigredv2/caves/lambda/breakroom)
+"Gv" = (
+/obj/structure/machinery/door/poddoor/almayer{
+ id = "sci_br";
+ name = "\improper Lambda Observation Shutters"
+ },
+/obj/item/shard,
+/obj/structure/window_frame/solaris/reinforced,
+/turf/open/floor/plating,
+/area/bigredv2/caves/lambda/breakroom)
+"RW" = (
+/obj/item/shard{
+ icon_state = "medium"
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_6"
+ },
+/area/bigredv2/caves_lambda)
(1,1,1) = {"
-aa
-aa
-aa
-ak
-al
-al
-al
-al
-al
+aA
+aA
+aA
+aA
+aA
+aI
+am
al
-aM
-aP
+aI
+aA
+aA
+aY
aT
-aX
+ak
"}
(2,1,1) = {"
-aa
-aa
-aa
-ak
-al
-am
+aA
+aA
+aA
+aA
+zP
+aG
aw
aD
aG
-al
-aM
-aP
-aT
+ai
+ai
+aZ
+ba
aX
"}
(3,1,1) = {"
-aa
-aa
+aA
+aA
ah
-ak
-al
-an
-ax
-aE
+ai
+ai
+aG
aH
-al
-aM
+aE
+aG
aP
-aT
-aX
+ba
+aP
+ai
+aZ
"}
(4,1,1) = {"
-aa
-aa
-ai
-ak
-al
-ao
+aA
+ae
+aP
+ba
+aZ
+aI
ax
-ao
+aC
aI
-al
-aM
-aP
-aT
-aX
+ae
+RW
+ac
+ba
+aZ
"}
(5,1,1) = {"
-aa
-aa
ai
-ak
-al
-ao
-ao
+ai
+aj
+ad
+aZ
+aG
ao
-aJ
-al
-aM
-aQ
-aU
-aQ
+ag
+EW
+af
+ba
+ba
+ba
+aZ
"}
(6,1,1) = {"
-aa
-aa
+aY
ai
-ak
-al
-zP
-ao
-ao
-as
-al
+ai
+ba
+ba
+aG
+aa
+aD
+Gv
+vm
aN
-aR
-aR
-aY
+aS
+ba
+aZ
"}
(7,1,1) = {"
-aa
-aa
-aj
+ba
+ba
ak
-al
-aq
-ao
-ao
+ak
+ak
+aI
+an
+ab
ap
-al
-aO
-aS
-aS
+aA
+aA
+aP
aS
+aZ
"}
(8,1,1) = {"
-aa
-aa
-aa
+ba
ak
-al
-ar
-ao
-ao
-as
-al
-aM
-aQ
-aQ
-aQ
+ak
+aI
+aI
+aI
+aI
+aW
+aI
+aI
+aA
+ba
+aP
+aZ
"}
(9,1,1) = {"
-aa
-aa
-aa
+aZ
ak
-al
+ak
+aI
+aR
as
-aA
-aF
+au
+au
aK
-al
-aM
-aQ
-aQ
-aQ
+aI
+aA
+aY
+ba
+aZ
"}
(10,1,1) = {"
-aa
-af
-aa
ak
-al
-as
-aB
-ao
+aA
+aA
+aI
au
-al
-aM
-aQ
-aQ
+at
+aq
+at
+au
+aI
+aA
+aP
+ba
aZ
"}
(11,1,1) = {"
-ab
-aa
-aa
ak
-al
+aA
+aA
+aI
+aF
at
aB
-ao
-as
-al
-aM
-aQ
-aQ
-aT
+at
+aJ
+aI
+aA
+aP
+ba
+aZ
"}
(12,1,1) = {"
-ac
-ab
-aa
-ak
-al
+aA
+aA
+aA
+aI
au
-aB
-ao
-aL
-al
+at
aM
+at
+aL
+aI
+aA
aQ
aV
-aT
+ba
"}
(13,1,1) = {"
-ad
-ag
-aa
-ak
-al
+aA
+aA
+aA
+aI
+ar
av
-aB
-ao
-at
-al
-aM
-aP
-aT
+aL
+aL
+aL
+aI
+aA
+ba
+ba
ba
"}
(14,1,1) = {"
-ae
-aa
-aa
-ak
-al
-al
-aC
-al
-al
-al
-aM
-aQ
-aW
-aT
+aA
+aA
+aA
+aI
+aI
+aI
+aI
+aI
+aI
+aI
+aA
+ba
+ba
+ba
"}
diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm
index b00a12dc86bd..7029d71a6076 100644
--- a/maps/map_files/CORSAT/Corsat.dmm
+++ b/maps/map_files/CORSAT/Corsat.dmm
@@ -37445,7 +37445,7 @@
/area/corsat/gamma/biodome/virology)
"drp" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Gamma Landing Zone"
+ name = "LZ1: Gamma Landing Zone"
},
/turf/open/floor/plating,
/area/corsat/gamma/hangar)
@@ -38222,7 +38222,7 @@
/area/corsat/omega/complex)
"dUj" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "Sigma Landing Zone"
+ name = "LZ2: Sigma Landing Zone"
},
/turf/open/floor/plating,
/area/corsat/sigma/hangar)
diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
index 5da17a318887..ba9986948eed 100644
--- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
+++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
@@ -5305,7 +5305,7 @@
/area/prison/hanger/research)
"aoj" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "Research Landing Zone"
+ name = "LZ2: Research Landing Zone"
},
/turf/open/floor/plating,
/area/prison/hanger/research)
@@ -19201,7 +19201,7 @@
/area/prison/hanger/main)
"bcF" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Hangar Landing Zone"
+ name = "LZ1: Hangar Landing Zone"
},
/turf/open/floor/plating,
/area/prison/hanger/main)
diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
index 7238b5ab66cb..bffe3f990722 100644
--- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
@@ -6510,7 +6510,7 @@
/area/fiorina/station/disco)
"dYp" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Hangar Landing Zone"
+ name = "LZ1: Hangar Landing Zone"
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
index 73bac536752f..485760ebc2af 100644
--- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
+++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -34904,7 +34904,7 @@
/area/ice_colony/surface/hangar/alpha)
"sto" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Hangar Landing Zone"
+ name = "LZ1: Hangar Landing Zone"
},
/turf/open/floor/plating,
/area/ice_colony/exterior/surface/landing_pad)
diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
index f5e2f597ef24..60847e12bae1 100644
--- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
+++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
@@ -17375,7 +17375,7 @@
/area/shiva/interior/caves/s_lz2)
"mlX" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "Research Landing Zone"
+ name = "LZ2: Research Landing Zone"
},
/turf/open/floor/plating,
/area/shiva/exterior/lz2_fortress)
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index 676bd49576f0..d2d3111364df 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -62,6 +62,10 @@
"adD" = (
/turf/open/floor/almayer/research/containment/floor1,
/area/kutjevo/exterior/lz_dunes)
+"adG" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/colony_South)
"adX" = (
/obj/item/stack/sheet/wood,
/obj/structure/machinery/light,
@@ -362,6 +366,15 @@
dir = 4
},
/area/kutjevo/interior/complex/Northwest_Dorms)
+"axi" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+ pixel_x = -4;
+ pixel_y = 10
+ },
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 9
+ },
+/area/kutjevo/exterior/spring)
"axK" = (
/obj/item/trash/cigbutt/bcigbutt,
/obj/structure/stairs/perspective/kutjevo{
@@ -679,6 +692,13 @@
icon = 'icons/turf/floors/desert_water_toxic.dmi'
},
/area/kutjevo/interior/oob)
+"aXU" = (
+/obj/structure/barricade/wooden{
+ dir = 1;
+ pixel_y = 13
+ },
+/turf/open/desert/desert_shore/shore_edge1,
+/area/kutjevo/exterior/spring)
"aXV" = (
/obj/structure/machinery/colony_floodlight_switch,
/turf/closed/wall/kutjevo/colony/reinforced,
@@ -1958,6 +1978,14 @@
},
/turf/open/asphalt/cement_sunbleached,
/area/kutjevo/interior/power)
+"cKY" = (
+/obj/structure/prop/brazier/frame/full/campfire,
+/obj/item/tool/match/paper{
+ pixel_y = -2;
+ pixel_x = -11
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"cLn" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 1;
@@ -2286,6 +2314,11 @@
},
/turf/open/floor/plating/kutjevo,
/area/kutjevo/interior/complex/botany)
+"dcC" = (
+/turf/open/desert/desert_shore/shore_edge1{
+ dir = 1
+ },
+/area/kutjevo/exterior/spring)
"ddi" = (
/obj/structure/platform/kutjevo,
/obj/structure/blocker/invisible_wall,
@@ -2418,6 +2451,11 @@
dir = 10
},
/area/kutjevo/interior/colony_South/power2)
+"dnd" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 8
+ },
+/area/kutjevo/exterior/spring)
"dnl" = (
/obj/structure/platform/kutjevo/rock,
/turf/open/auto_turf/sand/layer1,
@@ -2676,6 +2714,15 @@
dir = 8
},
/area/kutjevo/exterior/runoff_river)
+"dBt" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+ pixel_x = -8;
+ pixel_y = 10
+ },
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 5
+ },
+/area/kutjevo/exterior/spring)
"dBO" = (
/obj/structure/ladder,
/obj/structure/blocker/invisible_wall,
@@ -2744,6 +2791,12 @@
},
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_South)
+"dGi" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 1
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"dGx" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/kutjevo/tan,
@@ -2867,6 +2920,11 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_north)
+"dOj" = (
+/turf/open/gm/river/desert/shallow_corner{
+ dir = 1
+ },
+/area/kutjevo/exterior/spring)
"dOJ" = (
/obj/structure/barricade/deployable,
/turf/open/floor/kutjevo/colors/purple/edge,
@@ -2957,6 +3015,10 @@
},
/turf/open/gm/river/desert/shallow,
/area/kutjevo/exterior/runoff_river)
+"dUc" = (
+/obj/structure/flora/grass/tallgrass/desert,
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/spring)
"dUy" = (
/obj/structure/platform/kutjevo/smooth,
/turf/open/floor/kutjevo/multi_tiles{
@@ -3046,6 +3108,15 @@
/obj/structure/blocker/invisible_wall,
/turf/open/floor/plating/kutjevo,
/area/kutjevo/exterior/runoff_dunes)
+"eaT" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/interior/colony_South)
+"ebv" = (
+/turf/open/desert/desert_shore/shore_corner2{
+ dir = 8
+ },
+/area/kutjevo/exterior/spring)
"ebB" = (
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/interior/colony_S_East)
@@ -3427,6 +3498,9 @@
"evZ" = (
/turf/open/floor/almayer/research/containment/floor2,
/area/kutjevo/interior/power)
+"ewl" = (
+/turf/open/desert/desert_shore/desert_shore1,
+/area/kutjevo/exterior/spring)
"ewF" = (
/obj/item/phone{
pixel_x = 1;
@@ -3548,6 +3622,20 @@
},
/turf/open/floor/kutjevo/grey/plate,
/area/kutjevo/interior/construction)
+"eCE" = (
+/obj/item/clipboard{
+ pixel_y = 4;
+ pixel_x = -4
+ },
+/obj/item/tool/pen{
+ name = "stained pen";
+ desc = "It's a seemingly normal pen... aside from the faint red fingerprints on the side...";
+ pixel_x = 2;
+ pixel_y = 10
+ },
+/obj/item/paper/crumpled/bloody,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"eCY" = (
/obj/structure/machinery/cryo_cell,
/turf/open/floor/kutjevo/grey/plate,
@@ -3604,6 +3692,10 @@
"eHX" = (
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/telecomm/lz1_south)
+"eIq" = (
+/obj/item/tool/hatchet,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"eIL" = (
/turf/open/floor/kutjevo/colors/cyan/edge{
dir = 4
@@ -3859,6 +3951,9 @@
dir = 4
},
/area/kutjevo/interior/colony_South/power2)
+"eVR" = (
+/turf/open/gm/river/desert/deep,
+/area/kutjevo/exterior/spring)
"eWP" = (
/obj/effect/landmark/corpsespawner/colonist/kutjevo,
/turf/open/floor/kutjevo/multi_tiles,
@@ -3943,6 +4038,10 @@
icon = 'icons/turf/floors/desert_water_toxic.dmi'
},
/area/kutjevo/interior/power)
+"fdH" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
"fdS" = (
/obj/effect/decal/cleanable/blood/xeno{
icon_state = "xgib1"
@@ -4114,6 +4213,10 @@
dir = 4
},
/area/kutjevo/interior/construction)
+"fne" = (
+/obj/item/trash/barcardine,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"foE" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/barricade/handrail/kutjevo{
@@ -4411,6 +4514,12 @@
},
/turf/open/floor/plating/kutjevo,
/area/kutjevo/interior/colony_South/power2)
+"fMB" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 5
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"fNc" = (
/obj/structure/platform/kutjevo{
dir = 4
@@ -4589,6 +4698,14 @@
/obj/structure/prop/dam/gravestone,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_N_East)
+"fYr" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"fYE" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/shuttle/dropship/flight/lz2,
@@ -4711,6 +4828,10 @@
dir = 8
},
/area/kutjevo/interior/power/comms)
+"giY" = (
+/obj/item/device/flashlight/lamp/tripod/grey,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"giZ" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
pixel_y = 28
@@ -4762,7 +4883,7 @@
/area/kutjevo/interior/oob)
"gnj" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Dunes Landing Zone"
+ name = "LZ1: Dunes Landing Zone"
},
/turf/open/floor/plating/kutjevo,
/area/shuttle/drop1/kutjevo)
@@ -4782,6 +4903,13 @@
dir = 10
},
/area/kutjevo/exterior/runoff_dunes)
+"gok" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_2";
+ pixel_y = 14
+ },
+/turf/open/desert/desert_shore/desert_shore1,
+/area/kutjevo/exterior/spring)
"goT" = (
/turf/closed/wall/kutjevo/rock,
/area/kutjevo/exterior/runoff_dunes)
@@ -4813,6 +4941,15 @@
/obj/item/clipboard,
/turf/open/floor/kutjevo/colors/green,
/area/kutjevo/interior/complex/botany)
+"gsn" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_2";
+ pixel_y = 14
+ },
+/turf/open/desert/desert_shore/desert_shore1{
+ dir = 1
+ },
+/area/kutjevo/exterior/spring)
"gsq" = (
/obj/structure/filingcabinet,
/obj/structure/window/reinforced/tinted{
@@ -4956,6 +5093,13 @@
"gBl" = (
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/oob)
+"gBu" = (
+/obj/structure/barricade/wooden{
+ dir = 4;
+ pixel_y = 4
+ },
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/spring)
"gBI" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -5053,6 +5197,9 @@
dir = 8
},
/area/kutjevo/interior/complex/Northwest_Flight_Control)
+"gFA" = (
+/turf/open/desert/desert_shore/shore_edge1,
+/area/kutjevo/exterior/spring)
"gHh" = (
/obj/structure/flora/grass/desert/lightgrass_9,
/turf/open/auto_turf/sand/layer0,
@@ -5072,6 +5219,15 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/grey/plate,
/area/kutjevo/interior/foremans_office)
+"gHV" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
+"gJx" = (
+/turf/open/gm/river/desert/shallow_corner{
+ dir = 4
+ },
+/area/kutjevo/exterior/spring)
"gJB" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 8;
@@ -5720,6 +5876,11 @@
},
/turf/open/floor/kutjevo/plate,
/area/kutjevo/interior/colony_central)
+"hET" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 10
+ },
+/area/kutjevo/exterior/spring)
"hFi" = (
/obj/structure/barricade/wooden{
dir = 1;
@@ -5848,6 +6009,10 @@
icon_state = "platingdmg3"
},
/area/kutjevo/interior/complex/Northwest_Dorms)
+"hRG" = (
+/obj/structure/prop/dam/boulder/boulder2,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"hSo" = (
/obj/structure/flora/grass/tallgrass/desert/corner{
dir = 10
@@ -5961,6 +6126,11 @@
},
/turf/open/floor/plating/kutjevo,
/area/kutjevo/exterior/construction)
+"hZx" = (
+/obj/structure/flora/grass/tallgrass/desert,
+/obj/structure/flora/grass/tallgrass/desert,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"iaj" = (
/turf/closed/wall/kutjevo/rock,
/area/kutjevo/exterior/lz_river)
@@ -6108,6 +6278,12 @@
},
/turf/open/floor/plating/kutjevo,
/area/kutjevo/interior/complex/med/triage)
+"irb" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 8
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"ird" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/platform/kutjevo{
@@ -6381,6 +6557,9 @@
/obj/item/storage/box/trackimp,
/turf/open/floor/kutjevo/tan,
/area/kutjevo/interior/complex/botany/east_tech)
+"iNI" = (
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
"iNY" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -6541,6 +6720,13 @@
},
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/complex_border/med_rec)
+"jac" = (
+/obj/item/device/radio{
+ name = "damp shortwave radio";
+ desc = "A regular shortwave radio, this one has experienced minor water damage but is still functional."
+ },
+/turf/open/desert/desert_shore/shore_corner2,
+/area/kutjevo/exterior/spring)
"jav" = (
/obj/structure/closet/secure_closet/engineering_welding,
/obj/item/ammo_box/magazine/nailgun,
@@ -6712,6 +6898,16 @@
/obj/item/stack/sheet/wood,
/turf/open/floor/kutjevo/colors,
/area/kutjevo/interior/power/comms)
+"jnD" = (
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
+/obj/structure/barricade/wooden{
+ dir = 1;
+ pixel_y = 13
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"jnS" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/plating/kutjevo,
@@ -7282,6 +7478,10 @@
/obj/structure/platform/kutjevo,
/turf/open/floor/kutjevo/tan,
/area/kutjevo/interior/colony_north)
+"kgx" = (
+/obj/structure/flora/grass/tallgrass/desert,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"khI" = (
/obj/structure/window/framed/kutjevo/reinforced/hull,
/turf/open/floor/kutjevo/grey/plate,
@@ -7668,6 +7868,9 @@
"kDS" = (
/turf/open/floor/kutjevo/tan,
/area/kutjevo/interior/complex/botany)
+"kEh" = (
+/turf/open/gm/river/desert/shallow_edge,
+/area/kutjevo/exterior/spring)
"kEG" = (
/obj/structure/sign/poster{
pixel_y = -32
@@ -7724,6 +7927,10 @@
"kIn" = (
/turf/open/auto_turf/sand/layer2,
/area/kutjevo/exterior/scrubland)
+"kIQ" = (
+/obj/structure/prop/dam/large_boulder/boulder2,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"kKb" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -7837,10 +8044,20 @@
},
/turf/open/floor/plating/kutjevo,
/area/kutjevo/interior/colony_South/power2)
+"kQa" = (
+/obj/structure/bed/bedroll,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"kQo" = (
/obj/structure/girder,
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/interior/construction)
+"kQD" = (
+/turf/open/desert/desert_shore/desert_shore1{
+ dir = 8
+ },
+/area/kutjevo/exterior/spring)
"kQU" = (
/obj/structure/platform/kutjevo{
dir = 8
@@ -8099,7 +8316,7 @@
/area/kutjevo/interior/power/comms)
"lkY" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "NW Colony Landing Zone"
+ name = "LZ2: NW Colony Landing Zone"
},
/turf/open/floor/plating/kutjevo,
/area/shuttle/drop2/kutjevo)
@@ -8361,6 +8578,11 @@
/obj/item/stack/sheet/wood,
/turf/open/floor/kutjevo/colors/purple,
/area/kutjevo/interior/complex/med/locks)
+"lEf" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 6
+ },
+/area/kutjevo/exterior/spring)
"lEA" = (
/turf/closed/wall/kutjevo/colony/reinforced,
/area/kutjevo/interior/colony_central)
@@ -8682,6 +8904,11 @@
"mbS" = (
/turf/closed/wall/kutjevo/colony,
/area/kutjevo/interior/complex/botany)
+"mct" = (
+/turf/open/gm/river/desert/shallow_corner{
+ dir = 8
+ },
+/area/kutjevo/exterior/spring)
"mcv" = (
/obj/structure/window/framed/kutjevo/reinforced/hull,
/obj/structure/blocker/invisible_wall,
@@ -8977,6 +9204,10 @@
dir = 6
},
/area/kutjevo/interior/complex/med/locks)
+"mvX" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"mwh" = (
/obj/structure/window/framed/kutjevo/reinforced,
/turf/open/floor/kutjevo/colors/green/tile,
@@ -8996,6 +9227,11 @@
/obj/item/frame/rack,
/turf/open/floor/kutjevo/tan/multi_tiles,
/area/kutjevo/interior/complex/botany/east_tech)
+"myk" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 4
+ },
+/area/kutjevo/exterior/spring)
"mzn" = (
/obj/structure/platform/kutjevo{
dir = 1
@@ -9015,6 +9251,18 @@
/obj/item/storage/pill_bottle/dexalin/skillless,
/turf/open/floor/kutjevo/grey/plate,
/area/kutjevo/interior/complex/med)
+"mAD" = (
+/obj/structure/barricade/wooden{
+ dir = 1;
+ pixel_y = 13
+ },
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"mAH" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/kutjevo_decals/catwalk,
@@ -9308,6 +9556,11 @@
color = "#990000"
},
/area/kutjevo/interior/oob)
+"mNv" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 5
+ },
+/area/kutjevo/exterior/spring)
"mNM" = (
/turf/closed/wall/kutjevo/colony,
/area/kutjevo/exterior/runoff_bridge)
@@ -10083,6 +10336,12 @@
/obj/structure/platform/kutjevo/rock,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_central)
+"nPq" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 6
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"nPs" = (
/obj/structure/blocker/invisible_wall,
/turf/open/auto_turf/sand/layer1,
@@ -10096,6 +10355,11 @@
/obj/structure/machinery/iv_drip,
/turf/open/floor/kutjevo/colors/cyan,
/area/kutjevo/interior/complex/med/triage)
+"nPX" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 9
+ },
+/area/kutjevo/exterior/spring)
"nQc" = (
/obj/structure/platform_decoration/kutjevo/rock,
/obj/structure/platform_decoration/kutjevo/rock{
@@ -10234,6 +10498,12 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/kutjevo/tan,
/area/kutjevo/interior/complex/med/operating)
+"nZC" = (
+/obj/structure/bed/bedroll,
+/obj/effect/landmark/corpsespawner/colonist/kutjevo,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
"nZK" = (
/turf/open/floor/kutjevo/tan,
/area/kutjevo/interior/complex/Northwest_Flight_Control)
@@ -10251,6 +10521,12 @@
},
/turf/open/floor/kutjevo/tan/alt_inner_edge,
/area/kutjevo/interior/complex/Northwest_Flight_Control)
+"obv" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 10
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"oca" = (
/obj/structure/surface/table/almayer,
/obj/item/device/flashlight/lamp,
@@ -10787,6 +11063,10 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/carpet,
/area/kutjevo/interior/oob)
+"oQb" = (
+/obj/structure/flora/grass/tallgrass/desert/corner,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"oQc" = (
/turf/closed/wall/kutjevo/colony,
/area/kutjevo/interior/power_pt2_electric_boogaloo)
@@ -10990,6 +11270,13 @@
icon_state = "0,5"
},
/area/kutjevo/interior/construction)
+"pfK" = (
+/obj/structure/barricade/wooden{
+ dir = 1;
+ pixel_y = 13
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"pfR" = (
/obj/structure/platform/kutjevo/rock{
dir = 4
@@ -11116,6 +11403,15 @@
"pmv" = (
/turf/closed/wall/kutjevo/colony/reinforced,
/area/kutjevo/exterior/complex_border/med_rec)
+"pmD" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 6
+ },
+/area/kutjevo/exterior/spring)
"pmR" = (
/obj/structure/largecrate/supply/supplies/flares,
/turf/open/auto_turf/sand/layer1,
@@ -11733,6 +12029,11 @@
dir = 4
},
/area/kutjevo/interior/complex/botany/east_tech)
+"qaU" = (
+/turf/open/desert/desert_shore/shore_corner2{
+ dir = 1
+ },
+/area/kutjevo/exterior/spring)
"qaY" = (
/obj/structure/blocker/invisible_wall,
/turf/open/desert/desert_shore/shore_corner2{
@@ -12102,6 +12403,12 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_S_East)
+"qFh" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 4
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"qFU" = (
/turf/open/desert/desert_shore/shore_corner2{
dir = 8
@@ -12493,6 +12800,10 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/kutjevo/colors/red,
/area/kutjevo/interior/complex/botany)
+"riT" = (
+/obj/item/stack/sheet/wood/small_stack,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"rjS" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/platform/kutjevo{
@@ -12661,6 +12972,10 @@
/obj/structure/window/framed/kutjevo/reinforced/hull,
/turf/open/floor/plating/kutjevo,
/area/kutjevo/interior/power)
+"rwC" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/interior/colony_South)
"rwL" = (
/obj/item/frame/table/almayer,
/turf/open/floor/kutjevo/tan,
@@ -12739,6 +13054,10 @@
"rCp" = (
/turf/open/desert/desert_shore/desert_shore1,
/area/kutjevo/exterior/runoff_bridge)
+"rDe" = (
+/obj/structure/prop/dam/boulder/boulder2,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
"rDO" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecalbottomright"
@@ -12998,6 +13317,13 @@
},
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/complex_border/botany_medical_cave)
+"rUE" = (
+/obj/structure/barricade/wooden{
+ dir = 4;
+ pixel_y = 4
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"rUM" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/structure/girder,
@@ -13212,6 +13538,9 @@
/obj/effect/spawner/random/tool,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/construction)
+"skx" = (
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"slb" = (
/obj/structure/machinery/light{
dir = 4
@@ -13299,6 +13628,10 @@
},
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/exterior/scrubland)
+"soL" = (
+/obj/item/stack/sheet/wood/small_stack,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
"soP" = (
/obj/structure/platform/kutjevo/smooth{
dir = 1
@@ -13544,6 +13877,11 @@
},
/turf/open/floor/kutjevo/colors,
/area/kutjevo/interior/complex/botany)
+"sGS" = (
+/turf/open/desert/desert_shore/shore_edge1{
+ dir = 8
+ },
+/area/kutjevo/exterior/spring)
"sHg" = (
/obj/structure/bed/chair{
dir = 4
@@ -13859,6 +14197,12 @@
"tax" = (
/turf/open/gm/river/desert/shallow_edge,
/area/kutjevo/exterior/runoff_dunes)
+"tbx" = (
+/obj/structure/flora/grass/tallgrass/desert/corner{
+ dir = 9
+ },
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"tdC" = (
/obj/structure/bed/chair{
dir = 4
@@ -14531,6 +14875,11 @@
/obj/structure/blocker/invisible_wall,
/turf/open/gm/river/desert/deep,
/area/kutjevo/interior/oob)
+"uaz" = (
+/turf/open/desert/desert_shore/desert_shore1{
+ dir = 1
+ },
+/area/kutjevo/exterior/spring)
"ubm" = (
/obj/structure/machinery/light{
dir = 8
@@ -14558,6 +14907,11 @@
/obj/structure/platform/kutjevo/rock,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_N_East)
+"ueM" = (
+/turf/open/desert/desert_shore/shore_corner2{
+ dir = 4
+ },
+/area/kutjevo/exterior/spring)
"ueO" = (
/obj/structure/prop/dam/boulder/boulder1,
/turf/open/auto_turf/sand/layer0,
@@ -14899,6 +15253,9 @@
},
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/complex_border/med_rec)
+"uzJ" = (
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/exterior/spring)
"uAh" = (
/obj/structure/platform/kutjevo/smooth,
/turf/open/floor/kutjevo/multi_tiles,
@@ -15150,6 +15507,10 @@
icon = 'icons/turf/floors/desert_water_toxic.dmi'
},
/area/kutjevo/interior/oob)
+"uNW" = (
+/obj/structure/prop/dam/boulder/boulder2,
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/colony_South)
"uNZ" = (
/obj/structure/machinery/colony_floodlight,
/obj/structure/platform/kutjevo/smooth{
@@ -15424,6 +15785,10 @@
/obj/structure/machinery/vending/snack,
/turf/open/floor/kutjevo/colors/red,
/area/kutjevo/interior/complex/botany)
+"vdK" = (
+/obj/item/stack/sheet/wood/small_stack,
+/turf/open/desert/desert_shore/desert_shore1,
+/area/kutjevo/exterior/spring)
"vdV" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/filtration/machine_96x96/indestructible{
@@ -15498,6 +15863,10 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/kutjevo/colors/green,
/area/kutjevo/interior/complex/botany)
+"vhC" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/spring)
"vhQ" = (
/obj/structure/platform_decoration/kutjevo/rock{
dir = 8
@@ -16316,6 +16685,16 @@
},
/turf/open/floor/kutjevo/multi_tiles,
/area/kutjevo/exterior/Northwest_Colony)
+"wrO" = (
+/turf/open/gm/river/desert/shallow_edge{
+ dir = 1
+ },
+/area/kutjevo/exterior/spring)
+"wrV" = (
+/turf/open/desert/desert_shore/desert_shore1{
+ dir = 4
+ },
+/area/kutjevo/exterior/spring)
"wsf" = (
/obj/structure/platform_decoration/kutjevo/rock{
dir = 8
@@ -16343,6 +16722,13 @@
dir = 1
},
/area/kutjevo/interior/foremans_office)
+"wtk" = (
+/obj/structure/barricade/wooden{
+ dir = 4;
+ pixel_y = 4
+ },
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/exterior/spring)
"wtu" = (
/obj/structure/platform_decoration/kutjevo{
dir = 4
@@ -17014,6 +17400,11 @@
dir = 8
},
/area/kutjevo/interior/complex/med/operating)
+"xuN" = (
+/turf/open/desert/desert_shore/shore_edge1{
+ dir = 4
+ },
+/area/kutjevo/exterior/spring)
"xuY" = (
/obj/structure/barricade/wooden,
/turf/open/floor/kutjevo/multi_tiles{
@@ -17034,6 +17425,9 @@
/obj/structure/window/framed/kutjevo/reinforced,
/turf/open/floor/plating/kutjevo,
/area/kutjevo/interior/complex/med/pano)
+"xxf" = (
+/turf/open/gm/river/desert/shallow_corner,
+/area/kutjevo/exterior/spring)
"xxz" = (
/obj/structure/prop/dam/gravestone{
icon_state = "gravestone3"
@@ -17487,6 +17881,15 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/tan/alt_inner_edge,
/area/kutjevo/interior/complex/Northwest_Flight_Control)
+"yic" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_2";
+ pixel_y = 14
+ },
+/turf/open/desert/desert_shore/desert_shore1{
+ dir = 4
+ },
+/area/kutjevo/exterior/spring)
"yir" = (
/turf/open/floor/kutjevo/colors/orange,
/area/kutjevo/interior/complex/botany/east)
@@ -43246,11 +43649,11 @@ bpj
bpj
bpj
bpj
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+uzJ
+skx
+hRG
dxF
dxF
dxF
@@ -43413,12 +43816,12 @@ bpj
bpj
bpj
bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+skx
+skx
+skx
+skx
dxF
dxF
dxF
@@ -43580,14 +43983,14 @@ bpj
bpj
oXH
bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+skx
+skx
+skx
+skx
+iNI
+iNI
dxF
dxF
dxF
@@ -43748,14 +44151,14 @@ npL
bpj
bpj
bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+skx
+skx
+skx
+uzJ
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -43915,16 +44318,16 @@ npL
bpj
bpj
bpj
+bpj
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+skx
+skx
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -44086,13 +44489,13 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+hRG
+skx
+mvX
+uzJ
+skx
+skx
+hRG
dxF
dxF
dxF
@@ -44254,14 +44657,14 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+skx
+skx
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -44421,15 +44824,15 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+skx
+skx
+skx
+skx
+skx
+skx
+skx
dxF
dxF
dxF
@@ -44589,15 +44992,15 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+skx
+uzJ
+skx
+skx
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -44757,14 +45160,14 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+skx
+skx
+uzJ
+uzJ
+skx
dxF
dxF
dxF
@@ -44926,13 +45329,13 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+skx
+skx
+mvX
+skx
+iNI
dxF
dxF
dxF
@@ -45095,12 +45498,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+rDe
+skx
+skx
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -45263,12 +45666,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+uzJ
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -45430,12 +45833,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+iNI
+skx
+uzJ
+uzJ
+skx
+skx
dxF
dxF
dxF
@@ -45598,15 +46001,15 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+mAD
+fYr
+riT
+fYr
+skx
+skx
+skx
+pfK
dxF
dxF
dxF
@@ -45766,16 +46169,16 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+eIq
+skx
+gHV
+skx
+uzJ
+kIQ
+skx
+skx
+skx
dxF
dxF
dxF
@@ -45933,17 +46336,17 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+giY
+skx
+skx
+skx
+mvX
+skx
+skx
+skx
+skx
+kQa
+vhC
dxF
dxF
dxF
@@ -46099,19 +46502,19 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+uzJ
+skx
+skx
+iNI
+iNI
+fdH
+iNI
+soL
+uzJ
+cKY
+mvX
+hRG
dxF
dxF
dxF
@@ -46265,21 +46668,21 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+hRG
+skx
+skx
+skx
+iNI
+dcC
+kQD
+kQD
+kQD
+aXU
+nZC
+gHV
+eCE
+skx
+fne
dxF
dxF
dxF
@@ -46432,21 +46835,21 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+uzJ
+skx
+iNI
+dcC
+qaU
+axi
+dnd
+hET
+vdK
+wtk
+riT
+rUE
+gBu
+rUE
dxF
dxF
dxF
@@ -46599,21 +47002,21 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+fMB
+mvX
+iNI
+dcC
+qaU
+nPX
+dOj
+eVR
+kEh
+jac
+gFA
+iNI
+skx
+nPq
+qFh
dxF
dxF
dxF
@@ -46765,23 +47168,23 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+kgx
+dGi
+uzJ
+iNI
+gsn
+nPX
+dOj
+eVR
+eVR
+mct
+hET
+ewl
+iNI
+skx
+oQb
+kgx
+dUc
dxF
dxF
dxF
@@ -46932,23 +47335,23 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+kgx
+dGi
+skx
+iNI
+uaz
+wrO
+eVR
+eVR
+eVR
+eVR
+kEh
+gok
+iNI
+giY
+oQb
+kgx
+kgx
dxF
dxF
dxF
@@ -47099,23 +47502,23 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+irb
+tbx
+skx
+iNI
+uaz
+wrO
+eVR
+eVR
+eVR
+eVR
+kEh
+ewl
+iNI
+skx
+oQb
+kgx
+kgx
dxF
dxF
dxF
@@ -47266,23 +47669,23 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+iNI
+uaz
+dBt
+xxf
+eVR
+eVR
+gJx
+pmD
+ewl
+iNI
+skx
+obv
+dUc
+kgx
dxF
dxF
dxF
@@ -47433,22 +47836,22 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+vhC
+uzJ
+skx
+iNI
+xuN
+ebv
+mNv
+myk
+myk
+lEf
+ueM
+sGS
+iNI
+kIQ
+skx
+obv
dxF
dxF
dxF
@@ -47601,21 +48004,21 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+iNI
+xuN
+wrV
+wrV
+yic
+wrV
+sGS
+iNI
+skx
+skx
+skx
+skx
dxF
dxF
dxF
@@ -47768,21 +48171,21 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+skx
+skx
+mvX
+iNI
+iNI
+iNI
+iNI
+iNI
+iNI
+skx
+uzJ
+skx
+skx
+uzJ
dxF
dxF
dxF
@@ -47921,24 +48324,8 @@ npL
bpj
bpj
bpj
-mMH
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+gBl
dxF
dxF
dxF
@@ -47949,6 +48336,22 @@ dxF
dxF
dxF
dxF
+iNI
+iNI
+jnD
+skx
+skx
+uzJ
+skx
+kIQ
+skx
+skx
+skx
+skx
+skx
+mvX
+skx
+hRG
dxF
dxF
dxF
@@ -48088,6 +48491,8 @@ tCm
bpj
bpj
bpj
+bpj
+bpj
dxF
dxF
dxF
@@ -48097,24 +48502,22 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+rDe
+iNI
+uzJ
+skx
+riT
+skx
+giY
+skx
+skx
+skx
+nPq
+qFh
+qFh
+fMB
+uzJ
+vhC
dxF
dxF
dxF
@@ -48254,26 +48657,10 @@ mMH
bpj
bpj
bpj
-mMH
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
dxF
dxF
dxF
@@ -48281,6 +48668,22 @@ dxF
dxF
dxF
dxF
+iNI
+skx
+skx
+skx
+skx
+jnD
+skx
+skx
+skx
+skx
+uzJ
+oQb
+dUc
+kgx
+dGi
+skx
dxF
dxF
dxF
@@ -48421,31 +48824,31 @@ wXd
npL
bpj
bpj
+bpj
+bpj
+bpj
+bpj
+mMH
mMH
dxF
dxF
dxF
dxF
+iNI
+skx
+mvX
+skx
+skx
+iNI
+iNI
dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+skx
+oQb
+kgx
+hZx
dxF
dxF
dxF
@@ -48588,21 +48991,21 @@ wXd
bpj
npL
bpj
-qOP
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+oXH
+bpj
+bpj
+bpj
+bpj
+bpj
+mMH
dxF
dxF
+skx
+skx
+uzJ
+skx
+iNI
+iNI
dxF
dxF
dxF
@@ -48757,18 +49160,18 @@ bpj
bpj
mMH
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+npL
+bpj
+bpj
+mMH
+bpj
+bpj
+skx
+skx
+skx
+iNI
dxF
dxF
dxF
@@ -48925,16 +49328,16 @@ bpj
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+oXH
+bpj
+bpj
+bpj
+uzJ
+skx
+iNI
dxF
dxF
dxF
@@ -49093,14 +49496,14 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
+bpj
+bpj
+skx
+skx
dxF
dxF
dxF
@@ -49260,12 +49663,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+npL
+bpj
+mMH
dxF
dxF
dxF
@@ -49429,10 +49832,10 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -49596,11 +49999,11 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -49763,11 +50166,11 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+uNW
+bpj
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -49931,10 +50334,10 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
+adG
+eaT
+rwC
+eaT
dxF
dxF
dxF
@@ -50098,10 +50501,10 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+oXH
+bpj
+bpj
dxF
dxF
dxF
@@ -50265,10 +50668,10 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
dxF
dxF
dxF
@@ -50431,11 +50834,11 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -50597,12 +51000,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+npL
+bpj
+mMH
dxF
dxF
dxF
@@ -50762,13 +51165,13 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -50929,13 +51332,13 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+npL
+bpj
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -51095,13 +51498,13 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
+bpj
+bpj
+npL
dxF
dxF
dxF
@@ -51262,12 +51665,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+oXH
+bpj
+bpj
+bpj
dxF
dxF
dxF
@@ -51428,13 +51831,13 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+npL
+bpj
+bpj
+bpj
+bpj
dxF
dxF
dxF
@@ -51595,12 +51998,12 @@ dxF
dxF
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+mMH
+bpj
+bpj
+bpj
+bpj
+mMH
dxF
dxF
dxF
@@ -51760,13 +52163,13 @@ bpj
bpj
dxF
dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+bpj
+npL
+bpj
+mMH
dxF
dxF
dxF
@@ -51926,13 +52329,13 @@ bpj
bpj
bpj
mMH
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+npL
+bpj
+bpj
+bpj
+bpj
+bpj
dxF
dxF
dxF
@@ -52093,13 +52496,13 @@ bpj
oXH
bpj
bpj
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+oXH
+bpj
+bpj
+mMH
+mMH
dxF
dxF
dxF
@@ -52260,11 +52663,11 @@ bpj
bpj
bpj
bpj
-dxF
-dxF
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
+npL
+mMH
dxF
dxF
dxF
@@ -52428,9 +52831,9 @@ bpj
bpj
bpj
mMH
-dxF
-dxF
-dxF
+bpj
+bpj
+bpj
dxF
dxF
dxF
diff --git a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
index 235f370b4321..bc89cfab0105 100644
--- a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
+++ b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
@@ -108,10 +108,6 @@
dir = 1
},
/area/template_noop)
-"qI" = (
-/obj/structure/window/framed/kutjevo,
-/turf/open/space/basic,
-/area/template_noop)
"qM" = (
/obj/structure/machinery/light,
/obj/effect/decal/cleanable/blood/oil,
@@ -492,7 +488,7 @@ Re
EK
"}
(5,1,1) = {"
-qI
+EK
wC
rG
LO
@@ -506,7 +502,7 @@ cm
YO
"}
(6,1,1) = {"
-qI
+EK
rm
lZ
nn
diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
index 50240fcd8d55..5a4fa0fbdf91 100644
--- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
+++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -1030,7 +1030,7 @@
/area/lv522/outdoors/colony_streets/north_east_street)
"aDE" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "Southeast Landing Zone"
+ name = "LZ2: Southeast Landing Zone"
},
/turf/open/floor/plating,
/area/shuttle/drop2/lv522)
@@ -7115,7 +7115,7 @@
/area/lv522/indoors/a_block/dorms)
"dos" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Southwest Landing Zone"
+ name = "LZ1: Southwest Landing Zone"
},
/turf/open/floor/plating,
/area/shuttle/drop1/lv522)
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index af507ab907fd..9c84577bbbdd 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -5862,7 +5862,7 @@
/area/lv624/ground/river/west_river)
"aBo" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "Robotics Landing Zone"
+ name = "LZ2: Robotics Landing Zone"
},
/turf/open/floor/plating,
/area/lv624/lazarus/landing_zones/lz2)
@@ -8590,7 +8590,7 @@
/area/lv624/ground/jungle/south_west_jungle)
"aLz" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "Nexus Landing Zone"
+ name = "LZ1: Nexus Landing Zone"
},
/turf/open/floor/plating,
/area/lv624/lazarus/landing_zones/lz1)
diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index aeddb1aa1021..656c4a7f48b1 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -788,7 +788,7 @@
/area/varadero/exterior/pool)
"aAX" = (
/obj/docking_port/stationary/marine_dropship/lz2{
- name = "LZ2 - Palm Airfield"
+ name = "LZ2: Palm Airfield"
},
/turf/open/gm/dirt,
/area/varadero/exterior/lz2_near)
@@ -23224,7 +23224,7 @@
/area/varadero/interior/security)
"oXw" = (
/obj/docking_port/stationary/marine_dropship/lz1{
- name = "LZ1 - Pontoon Dock"
+ name = "LZ1: Pontoon Dock"
},
/turf/open/floor/plating/icefloor,
/area/varadero/exterior/lz1_near)
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 42e343e1b713..263bce521d2a 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -529,17 +529,6 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
-"abQ" = (
-/obj/item/device/radio/intercom{
- freerange = 1;
- name = "General Listening Channel";
- pixel_y = 28
- },
-/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"abR" = (
/obj/item/tank/phoron,
/turf/open/floor/almayer{
@@ -798,6 +787,12 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_s)
+"acE" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/lifeboat_pumps/north2)
"acF" = (
/obj/structure/machinery/light{
dir = 1
@@ -920,20 +915,12 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
-"acS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
- pixel_y = -29
- },
+"acT" = (
+/obj/structure/closet/firecloset,
/turf/open/floor/almayer{
- icon_state = "silver"
+ icon_state = "cargo"
},
-/area/almayer/command/cichallway)
+/area/almayer/lifeboat_pumps/north2)
"acU" = (
/obj/structure/closet/basketball,
/turf/open/floor/almayer{
@@ -1183,6 +1170,15 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/north1)
+"adQ" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north2)
"adR" = (
/obj/structure/machinery/door/airlock/almayer/generic{
access_modified = 1;
@@ -1211,6 +1207,13 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
+"adZ" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/north2)
"aea" = (
/obj/structure/machinery/light{
dir = 1
@@ -1560,6 +1563,17 @@
icon_state = "redfull"
},
/area/almayer/shipboard/starboard_missiles)
+"afc" = (
+/obj/structure/reagent_dispensers/water_cooler/stacks{
+ density = 0;
+ pixel_y = 17
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "W";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_s)
"afd" = (
/obj/structure/largecrate/random/barrel/white,
/obj/structure/sign/safety/bulkhead_door{
@@ -2559,14 +2573,6 @@
icon_state = "red"
},
/area/almayer/living/starboard_garden)
-"aiQ" = (
-/obj/structure/machinery/faxmachine,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light/small,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"aiR" = (
/obj/structure/stairs{
dir = 8;
@@ -2614,16 +2620,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
-"aiW" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 1
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"aiX" = (
/turf/closed/wall/almayer,
/area/almayer/living/pilotbunks)
@@ -2667,12 +2663,6 @@
"ajl" = (
/turf/closed/wall/almayer/white,
/area/almayer/medical/upper_medical)
-"ajm" = (
-/obj/structure/closet/secure_closet/securecom,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"ajp" = (
/obj/structure/surface/table/almayer,
/obj/structure/dropship_equipment/fuel/cooling_system{
@@ -2973,14 +2963,12 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/weapon_room)
-"ako" = (
+"akr" = (
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 1
+ dir = 8;
+ icon_state = "pipe-c"
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
"akt" = (
/obj/structure/cable/heavyduty{
@@ -3516,15 +3504,6 @@
icon_state = "blue"
},
/area/almayer/hallways/aft_hallway)
-"amE" = (
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/structure/surface/rack,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/engineering/upper_engineering)
"amF" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
@@ -3727,6 +3706,12 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/aft_hallway)
+"anl" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 5
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
"anm" = (
/obj/structure/stairs{
icon_state = "ramptop"
@@ -3747,47 +3732,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_a_s)
-"anp" = (
-/obj/structure/sign/safety/hazard{
- pixel_x = 15;
- pixel_y = 32
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/medical/upper_medical)
-"anq" = (
-/obj/item/device/radio/intercom{
- freerange = 1;
- name = "General Listening Channel";
- pixel_y = 28
- },
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/structure/surface/rack,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/medical/upper_medical)
-"anr" = (
-/obj/structure/sign/safety/intercom{
- pixel_x = 8;
- pixel_y = 32
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/medical/upper_medical)
"ans" = (
/turf/open/floor/almayer{
dir = 8;
@@ -5410,16 +5354,6 @@
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer,
/area/almayer/engineering/engineering_workshop/hangar)
-"asu" = (
-/obj/structure/sign/safety/hazard{
- pixel_x = 32;
- pixel_y = -8
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/medical/upper_medical)
"asv" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/machinery/light{
@@ -5837,12 +5771,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/engineering/engineering_workshop/hangar)
-"atx" = (
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"aty" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/almayer{
@@ -6018,6 +5946,14 @@
icon_state = "blue"
},
/area/almayer/hallways/aft_hallway)
+"atY" = (
+/obj/structure/closet/emcloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/lifeboat)
"atZ" = (
/obj/structure/machinery/door_control{
id = "OTStore";
@@ -7339,16 +7275,6 @@
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering)
-"axR" = (
-/obj/structure/machinery/shower,
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/machinery/door/window/tinted{
- dir = 2
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
"axV" = (
/obj/structure/machinery/telecomms/server/presets/command,
/turf/open/floor/almayer{
@@ -7795,33 +7721,6 @@
icon_state = "bluecorner"
},
/area/almayer/living/offices/flight)
-"azm" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/paper_bin/uscm{
- pixel_y = 7;
- pixel_x = -17
- },
-/obj/item/tool/pen/clicky{
- pixel_x = -13;
- pixel_y = -1
- },
-/obj/item/tool/pen/clicky{
- pixel_y = 5;
- pixel_x = -13
- },
-/obj/structure/machinery/door_control{
- id = "CO-Office";
- name = "Door Control";
- normaldoorcontrol = 1;
- req_access_txt = "31";
- pixel_y = 7
- },
-/obj/item/ashtray/bronze{
- pixel_y = 1;
- pixel_x = 12
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"azn" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/turf/open/floor/almayer{
@@ -7837,12 +7736,6 @@
icon_state = "plating"
},
/area/almayer/engineering/upper_engineering)
-"azp" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/engineering/upper_engineering)
"azq" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out";
@@ -8853,6 +8746,14 @@
icon_state = "orangecorner"
},
/area/almayer/command/telecomms)
+"aDc" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"aDe" = (
/obj/structure/machinery/light{
dir = 8
@@ -9646,6 +9547,12 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/operating_room_four)
+"aGi" = (
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/command/cic)
"aGj" = (
/obj/structure/machinery/door/poddoor/almayer/open{
dir = 2;
@@ -9824,6 +9731,24 @@
"aHe" = (
/turf/closed/wall/almayer,
/area/almayer/command/lifeboat)
+"aHk" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/sink{
+ pixel_y = 16
+ },
+/obj/structure/mirror{
+ pixel_y = 21
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/numbertwobunks)
"aHl" = (
/obj/structure/machinery/portable_atmospherics/canister/air,
/turf/open/floor/engine,
@@ -9978,6 +9903,12 @@
},
/turf/open/floor/engine,
/area/almayer/engineering/airmix)
+"aHT" = (
+/obj/structure/bed/chair/wood/normal,
+/obj/item/bedsheet/brown,
+/obj/item/toy/plush/farwa,
+/turf/open/floor/wood/ship,
+/area/almayer/shipboard/brig/cells)
"aHU" = (
/obj/structure/platform{
dir = 1
@@ -10204,12 +10135,6 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering)
-"aIV" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/engineering/upper_engineering)
"aIX" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -10472,11 +10397,6 @@
icon_state = "silver"
},
/area/almayer/command/cichallway)
-"aKk" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"aKn" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -10768,6 +10688,25 @@
icon_state = "dark_sterile"
},
/area/almayer/living/numbertwobunks)
+"aLt" = (
+/obj/structure/surface/rack,
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/numbertwobunks)
+"aLA" = (
+/obj/item/trash/uscm_mre,
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"aLB" = (
/turf/closed/wall/almayer,
/area/almayer/hallways/starboard_hallway)
@@ -11109,6 +11048,14 @@
icon_state = "red"
},
/area/almayer/squads/alpha)
+"aNe" = (
+/obj/structure/closet/firecloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/lifeboat)
"aNi" = (
/turf/closed/wall/almayer,
/area/almayer/living/chapel)
@@ -11264,18 +11211,6 @@
/obj/effect/landmark/start/nurse,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/offices)
-"aOj" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
- name = "\improper Bathroom";
- dir = 2
- },
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 1
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/commandbunks)
"aOq" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/extinguisher,
@@ -12095,12 +12030,25 @@
},
/area/almayer/medical/upper_medical)
"aSh" = (
-/obj/structure/bed/chair/comfy/alpha{
- dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/paper_bin/uscm{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = -11;
+ pixel_y = 5
+ },
+/obj/item/tool/pen{
+ pixel_x = -10;
+ pixel_y = -2
},
-/obj/item/prop/helmetgarb/helmet_nvg/cosmetic,
/turf/open/floor/almayer{
- icon_state = "redfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"aSl" = (
@@ -12352,11 +12300,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/cichallway)
-"aTl" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/almayer/command/cichallway)
"aTm" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/north1)
@@ -12530,6 +12473,12 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/basketball)
+"aTV" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
"aTW" = (
/obj/structure/bed/chair{
dir = 8
@@ -12714,6 +12663,12 @@
icon_state = "green"
},
/area/almayer/living/offices)
+"aUP" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"aUY" = (
/obj/structure/machinery/light{
dir = 4
@@ -13053,6 +13008,23 @@
icon_state = "test_floor4"
},
/area/almayer/lifeboat_pumps/south1)
+"aWA" = (
+/obj/structure/toilet{
+ pixel_y = 13
+ },
+/obj/item/paper_bin/uscm{
+ pixel_x = 9;
+ pixel_y = -3
+ },
+/obj/structure/machinery/light/small{
+ dir = 4
+ },
+/obj/item/prop/magazine/dirty{
+ pixel_x = -6;
+ pixel_y = -10
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/captain_mess)
"aWD" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -14653,6 +14625,16 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_p)
+"bfe" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering/port)
"bfl" = (
/turf/open/floor/almayer{
dir = 5;
@@ -15172,10 +15154,6 @@
icon_state = "bluefull"
},
/area/almayer/living/bridgebunks)
-"bhM" = (
-/obj/structure/safe/cl_office,
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
"bhT" = (
/obj/structure/cargo_container/lockmart/mid{
layer = 3.1;
@@ -15270,22 +15248,6 @@
icon_state = "sterile_green_corner"
},
/area/almayer/medical/lower_medical_medbay)
-"biJ" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/obj/structure/machinery/camera/autoname/almayer{
- dir = 1;
- name = "ship-grade camera"
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "SW-out";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"biL" = (
/obj/structure/platform{
dir = 4
@@ -15449,13 +15411,6 @@
icon_state = "plate"
},
/area/almayer/hallways/starboard_umbilical)
-"bjQ" = (
-/obj/structure/machinery/shower{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
"bjR" = (
/obj/structure/cargo_container/arious/right,
/turf/open/floor/almayer,
@@ -16276,16 +16231,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_p)
-"boc" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 2
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
"bof" = (
/obj/structure/pipes/vents/scrubber{
dir = 4
@@ -16541,15 +16486,6 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
-"bpw" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "SW-out";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south1)
"bpz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -17986,16 +17922,6 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/starboard_hallway)
-"bxA" = (
-/obj/structure/machinery/power/apc/almayer/hardened,
-/obj/effect/decal/warning_stripes{
- icon_state = "SW-out";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south2)
"bxB" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -19957,16 +19883,6 @@
icon_state = "green"
},
/area/almayer/squads/req)
-"bGz" = (
-/obj/structure/window/framed/almayer,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 1
- },
-/turf/open/floor/almayer{
- dir = 9;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"bGF" = (
/obj/structure/machinery/landinglight/ds2{
dir = 1
@@ -20270,6 +20186,28 @@
"bHP" = (
/turf/open/floor/plating/almayer,
/area/almayer/shipboard/weapon_room)
+"bHS" = (
+/obj/structure/surface/table/almayer,
+/obj/item/trash/USCMtray{
+ pixel_y = 4
+ },
+/obj/item/trash/USCMtray{
+ pixel_y = 6
+ },
+/obj/item/trash/USCMtray{
+ pixel_y = 8
+ },
+/obj/item/trash/USCMtray{
+ pixel_y = 10
+ },
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"bHT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20438,6 +20376,25 @@
},
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/navigation)
+"bIA" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/structure/mirror{
+ pixel_x = 29
+ },
+/obj/structure/machinery/light{
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/auxiliary_officer_office)
"bII" = (
/obj/structure/sign/safety/distribution_pipes{
pixel_x = 8;
@@ -22323,23 +22280,6 @@
icon_state = "tcomms"
},
/area/almayer/engineering/engine_core)
-"bQl" = (
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/obj/item/prop/magazine/boots/n160{
- pixel_y = -8;
- pixel_x = 4;
- layer = 2.8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/commandbunks)
"bQm" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/almayer{
@@ -22442,12 +22382,6 @@
},
/turf/closed/wall/almayer,
/area/almayer/squads/req)
-"bQS" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend,
-/turf/open/floor/almayer{
- icon_state = "green"
- },
-/area/almayer/squads/req)
"bQU" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 8
@@ -22541,6 +22475,14 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/lobby)
+"bRo" = (
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/airoom)
"bRr" = (
/obj/structure/machinery/fuelcell_recycler,
/turf/open/floor/almayer{
@@ -23207,19 +23149,6 @@
icon_state = "blue"
},
/area/almayer/squads/charlie_delta_shared)
-"bUo" = (
-/obj/structure/sign/safety/ammunition{
- pixel_x = 15;
- pixel_y = -32
- },
-/obj/structure/sign/safety/hazard{
- pixel_y = -32
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/squads/req)
"bUp" = (
/obj/structure/surface/table/almayer,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -23432,6 +23361,13 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/medical/medical_science)
+"bVg" = (
+/obj/structure/machinery/status_display{
+ pixel_x = 32;
+ pixel_y = 16
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"bVi" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -23465,12 +23401,6 @@
icon_state = "blue"
},
/area/almayer/squads/delta)
-"bVs" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"bVw" = (
/turf/open/floor/almayer{
dir = 4;
@@ -23785,18 +23715,10 @@
/area/almayer/engineering/engineering_workshop)
"bXc" = (
/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/snacks/mre_pack/xmas2{
- pixel_x = 5;
+/obj/structure/machinery/microwave{
pixel_y = 9
},
-/obj/effect/landmark/map_item{
- layer = 3.03;
- pixel_x = -7;
- pixel_y = 4
- },
-/obj/item/reagent_container/food/snacks/mre_pack/xmas3{
- pixel_x = 5
- },
+/obj/item/reagent_container/food/snacks/packaged_burger,
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -24036,13 +23958,6 @@
/obj/structure/machinery/light,
/turf/open/floor/almayer,
/area/almayer/hallways/vehiclehangar)
-"bYa" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend,
-/turf/open/floor/almayer{
- dir = 10;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"bYc" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
@@ -24997,6 +24912,15 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
+"ccm" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/fridge/organic,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"ccq" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -25132,14 +25056,14 @@
},
/area/almayer/engineering/lower_engineering)
"ccF" = (
-/obj/structure/bed/chair/comfy/alpha{
- dir = 1
- },
/obj/structure/machinery/light{
dir = 8
},
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 1
+ },
/turf/open/floor/almayer{
- icon_state = "redfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"ccG" = (
@@ -25359,13 +25283,6 @@
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
/area/almayer/hallways/hangar)
-"cdB" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"cdE" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/drinks/cans/waterbottle{
@@ -25749,15 +25666,27 @@
/turf/open/floor/almayer,
/area/almayer/squads/charlie)
"cgz" = (
-/obj/structure/bed/chair/comfy/charlie,
/obj/structure/sign/poster{
desc = "Eat an EAT bar! ...Aren't they called MEAT bars?";
icon_state = "poster7";
name = "EAT - poster";
pixel_x = 27
},
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin/uscm{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 9
+ },
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 2
+ },
/turf/open/floor/almayer{
- icon_state = "emeraldfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"cgA" = (
@@ -26016,6 +25945,12 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/alpha)
+"cij" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/engineering/upper_engineering)
"cil" = (
/obj/structure/machinery/light,
/obj/structure/sign/safety/waterhazard{
@@ -26402,6 +26337,15 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_a_s)
+"ckE" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north1)
"ckI" = (
/obj/structure/disposalpipe/segment,
/obj/item/device/radio/intercom{
@@ -26881,16 +26825,6 @@
icon_state = "plating"
},
/area/almayer/shipboard/port_point_defense)
-"cmo" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/spawner/random/powercell,
-/obj/effect/spawner/random/tool,
-/obj/item/packageWrap,
-/turf/open/floor/almayer{
- dir = 8;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"cmp" = (
/turf/closed/wall/almayer,
/area/almayer/engineering/engineering_workshop/hangar)
@@ -27219,10 +27153,6 @@
icon_state = "blue"
},
/area/almayer/squads/delta)
-"com" = (
-/obj/structure/largecrate/supply/weapons/pistols,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
"cop" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/tankerbunks)
@@ -27244,14 +27174,6 @@
icon_state = "plate"
},
/area/almayer/squads/alpha_bravo_shared)
-"coD" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_18";
- pixel_y = 12
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"coG" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/almayer{
@@ -27437,21 +27359,6 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
-"crw" = (
-/obj/structure/bed/bedroll{
- name = "cat bed";
- desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
- pixel_y = 0
- },
-/mob/living/simple_animal/cat/Jones{
- dir = 8
- },
-/obj/structure/machinery/firealarm{
- pixel_y = 28;
- pixel_x = -1
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"crD" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
@@ -27460,10 +27367,8 @@
},
/area/almayer/squads/req)
"crK" = (
-/obj/structure/bed/chair/comfy/alpha{
- dir = 1
- },
/obj/structure/pipes/vents/pump,
+/obj/structure/surface/table/almayer,
/turf/open/floor/almayer{
icon_state = "redfull"
},
@@ -27493,8 +27398,15 @@
},
/area/almayer/hull/upper_hull/u_m_p)
"csG" = (
-/obj/structure/bed/chair/comfy/delta,
-/obj/item/trash/popcorn,
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ pixel_x = 15
+ },
+/obj/item/paper,
+/obj/item/reagent_container/food/drinks/cans/waterbottle{
+ pixel_x = -10;
+ pixel_y = 4
+ },
/turf/open/floor/almayer{
icon_state = "bluefull"
},
@@ -27588,6 +27500,15 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/cryo)
+"cum" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"cus" = (
/obj/docking_port/stationary/lifeboat_dock/starboard,
/turf/open/floor/almayer_hull{
@@ -27733,6 +27654,13 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/main_office)
+"cxZ" = (
+/obj/structure/bed/chair/comfy/delta,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"cyo" = (
/obj/structure/machinery/vending/cigarette,
/turf/open/floor/almayer{
@@ -27778,6 +27706,12 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/brig/execution)
+"czG" = (
+/obj/structure/machinery/recharge_station,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/airoom)
"czJ" = (
/obj/structure/sign/safety/restrictedarea{
pixel_x = 8;
@@ -28094,7 +28028,9 @@
pixel_x = -27
},
/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"cEO" = (
/obj/structure/largecrate/supply/floodlights,
@@ -28202,6 +28138,17 @@
"cHu" = (
/turf/closed/wall/almayer/research/containment/wall/south,
/area/almayer/medical/containment/cell/cl)
+"cHA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"cHE" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -28240,6 +28187,13 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_f_s)
+"cIl" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"cIr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28385,11 +28339,17 @@
},
/area/almayer/engineering/upper_engineering/port)
"cKX" = (
-/obj/structure/platform,
/obj/structure/pipes/vents/scrubber{
dir = 4
},
-/turf/open/floor/almayer,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
+ },
/area/almayer/living/briefing)
"cKY" = (
/obj/structure/machinery/light,
@@ -28529,15 +28489,6 @@
icon_state = "test_floor4"
},
/area/almayer/medical/containment/cell/cl)
-"cNK" = (
-/obj/structure/pipes/vents/pump{
- dir = 1
- },
-/obj/structure/machinery/light/small,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"cNX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28625,6 +28576,23 @@
"cQv" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/brig/general_equipment)
+"cQD" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
+/obj/structure/mirror{
+ pixel_x = -29
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/commandbunks)
"cQF" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/almayer{
@@ -28663,6 +28631,16 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
+"cRg" = (
+/obj/item/tool/weldpack{
+ pixel_y = 15
+ },
+/obj/structure/surface/table/almayer,
+/obj/item/clothing/head/welding,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"cRi" = (
/turf/open/floor/almayer{
icon_state = "mono"
@@ -28785,12 +28763,6 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_f_p)
-"cVb" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north2)
"cVs" = (
/obj/structure/platform_decoration{
dir = 8
@@ -28900,16 +28872,6 @@
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_m_s)
-"cWE" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering/port)
"cWI" = (
/obj/structure/prop/invuln/overhead_pipe{
pixel_x = 12
@@ -29270,6 +29232,12 @@
icon_state = "plating"
},
/area/almayer/engineering/engine_core)
+"ddN" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/squads/req)
"deb" = (
/obj/structure/bed,
/obj/structure/machinery/flasher{
@@ -29375,6 +29343,17 @@
icon_state = "dark_sterile"
},
/area/almayer/shipboard/brig/surgery)
+"dfP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/l42a,
+/obj/item/weapon/gun/rifle/l42a{
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"dgg" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 4;
@@ -29415,11 +29394,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
-"dha" = (
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"dhQ" = (
/obj/structure/sign/safety/terminal{
pixel_x = -17
@@ -29467,12 +29441,13 @@
},
/area/almayer/hallways/starboard_umbilical)
"diw" = (
-/obj/structure/bed/chair/comfy/delta,
/obj/structure/machinery/light{
dir = 8
},
+/obj/structure/bed/chair/comfy/delta,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
- icon_state = "bluefull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"diz" = (
@@ -29513,6 +29488,14 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/alpha_bravo_shared)
+"diM" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"djm" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -29567,6 +29550,14 @@
icon_state = "orange"
},
/area/almayer/engineering/engineering_workshop/hangar)
+"djN" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/engineering/upper_engineering/port)
"djQ" = (
/obj/item/device/radio/intercom{
freerange = 1;
@@ -29604,6 +29595,25 @@
icon_state = "redfull"
},
/area/almayer/living/offices/flight)
+"dkn" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/machinery/door_control{
+ id = "bot_uniforms";
+ name = "Uniform Vendor Lockdown";
+ pixel_x = -24;
+ pixel_y = 18;
+ req_access_txt = "31"
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/cic)
"dkq" = (
/obj/structure/machinery/door_control{
id = "hangarentrancenorth";
@@ -29622,10 +29632,10 @@
},
/area/almayer/living/briefing)
"dkH" = (
-/obj/structure/bed/chair/comfy/delta,
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 6
},
+/obj/structure/bed/chair/comfy/delta,
/turf/open/floor/almayer{
icon_state = "bluefull"
},
@@ -29646,6 +29656,17 @@
allow_construction = 0
},
/area/almayer/stair_clone/upper)
+"dkS" = (
+/obj/structure/machinery/shower,
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/machinery/door/window/tinted{
+ dir = 2
+ },
+/obj/item/clothing/mask/cigarette/weed,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
"dll" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer{
@@ -29667,6 +29688,15 @@
icon_state = "dark_sterile"
},
/area/almayer/shipboard/brig/surgery)
+"dlN" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/lifeboat_pumps/north1)
"dmg" = (
/obj/structure/machinery/vending/coffee,
/obj/structure/sign/safety/coffee{
@@ -29762,6 +29792,22 @@
icon_state = "mono"
},
/area/almayer/engineering/upper_engineering/starboard)
+"dnJ" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/obj/structure/machinery/camera/autoname/almayer{
+ name = "ship-grade camera"
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"dnS" = (
/obj/structure/safe,
/turf/open/floor/almayer{
@@ -29825,28 +29871,6 @@
icon_state = "cargo"
},
/area/almayer/squads/req)
-"doU" = (
-/obj/structure/surface/rack,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
-"dpn" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/reagent_container/food/condiment/enzyme,
-/obj/item/reagent_container/food/condiment/enzyme,
-/obj/structure/transmitter{
- name = "Kitchen Telephone";
- phone_category = "Almayer";
- phone_id = "Kitchen";
- pixel_x = -8;
- pixel_y = 29
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/grunt_rnr)
"dpo" = (
/obj/structure/machinery/light{
dir = 1
@@ -29959,6 +29983,12 @@
icon_state = "green"
},
/area/almayer/hallways/aft_hallway)
+"dqQ" = (
+/obj/structure/closet/secure_closet/fridge/groceries,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"dqV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30001,6 +30031,18 @@
icon_state = "silver"
},
/area/almayer/engineering/port_atmos)
+"drp" = (
+/obj/structure/toilet{
+ dir = 8;
+ layer = 2.9;
+ pixel_y = 8
+ },
+/obj/structure/window{
+ layer = 2.95;
+ pixel_y = -2
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/commandbunks)
"drt" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -30058,6 +30100,12 @@
icon_state = "plate"
},
/area/almayer/shipboard/brig/cryo)
+"dtv" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "SE-out"
+ },
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
"dtH" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -30141,15 +30189,6 @@
icon_state = "mono"
},
/area/almayer/living/starboard_garden)
-"duz" = (
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/structure/sink{
- pixel_y = 24
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
"duF" = (
/obj/structure/closet/secure_closet/personal,
/turf/open/floor/almayer{
@@ -30344,15 +30383,6 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
-"dyj" = (
-/obj/structure/closet/secure_closet/commander,
-/obj/item/clothing/suit/storage/marine/light/vest,
-/obj/item/device/whistle,
-/obj/item/device/megaphone,
-/obj/item/device/radio,
-/obj/item/clothing/shoes/laceup,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"dyp" = (
/obj/structure/machinery/ares/cpu,
/turf/open/floor/almayer/no_build{
@@ -30418,6 +30448,17 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_p)
+"dAi" = (
+/obj/structure/sign/nosmoking_2{
+ pixel_x = 32
+ },
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/lifeboat_pumps/north1)
"dAq" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/disposalpipe/segment{
@@ -30435,7 +30476,9 @@
dir = 8
},
/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"dAX" = (
/obj/structure/machinery/camera/autoname/almayer{
@@ -30685,12 +30728,6 @@
icon_state = "greencorner"
},
/area/almayer/hallways/starboard_hallway)
-"dEJ" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/lifeboat_pumps/north2)
"dEQ" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/condiment/hotsauce/tabasco,
@@ -30705,24 +30742,6 @@
/obj/structure/machinery/light,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_p)
-"dFb" = (
-/obj/structure/surface/table/woodentable/fancy,
-/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 = -3;
- pixel_y = 9
- },
-/obj/item/prop/helmetgarb/rosary{
- pixel_y = 5;
- pixel_x = -4
- },
-/obj/item/device/flashlight/lamp{
- pixel_y = 1;
- pixel_x = 3
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"dFk" = (
/turf/open/floor/almayer{
dir = 8;
@@ -30938,16 +30957,6 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
-"dID" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"dII" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo,
/obj/effect/decal/warning_stripes{
@@ -30970,12 +30979,6 @@
icon_state = "cargo"
},
/area/almayer/hull/lower_hull/l_m_s)
-"dKa" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/hull/upper_hull/u_f_s)
"dKm" = (
/obj/structure/machinery/power/apc/almayer{
dir = 4
@@ -31018,16 +31021,6 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
-"dLe" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
-/turf/open/floor/almayer{
- icon_state = "silver"
- },
-/area/almayer/command/cichallway)
"dLt" = (
/obj/structure/sign/safety/hazard{
pixel_x = -17;
@@ -31052,20 +31045,6 @@
icon_state = "silver"
},
/area/almayer/hallways/aft_hallway)
-"dMf" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/photo_album{
- pixel_x = -4;
- pixel_y = 5
- },
-/obj/item/folder/black{
- pixel_x = 7;
- pixel_y = -3
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"dMB" = (
/turf/open/floor/almayer{
dir = 8;
@@ -31195,25 +31174,6 @@
icon_state = "silver"
},
/area/almayer/command/airoom)
-"dQp" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_x = 1;
- pixel_y = 1
- },
-/obj/structure/machinery/door/airlock/almayer/generic{
- dir = 1;
- name = "Bathroom"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/shipboard/brig/cells)
"dQs" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 1
@@ -31257,12 +31217,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/medical/hydroponics)
-"dRs" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/engineering/upper_engineering/port)
"dRv" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -31326,6 +31280,19 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/main_office)
+"dSn" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/shipboard/brig/cells)
"dSp" = (
/obj/structure/machinery/camera/autoname/almayer{
name = "ship-grade camera"
@@ -31573,13 +31540,6 @@
icon_state = "dark_sterile"
},
/area/almayer/engineering/laundry)
-"dXo" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/taperecorder,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"dXr" = (
/obj/structure/bed/chair{
dir = 8;
@@ -31633,6 +31593,17 @@
},
/turf/open/floor/almayer,
/area/almayer/living/chapel)
+"dYH" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"dYK" = (
/obj/item/folder/red{
desc = "A red folder. The previous contents are a mystery, though the number 28 has been written on the inside of each flap numerous times. Smells faintly of cough syrup.";
@@ -31732,6 +31703,12 @@
icon_state = "plate"
},
/area/almayer/shipboard/port_point_defense)
+"eaX" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/engineering/upper_engineering/starboard)
"ebd" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/plating_catwalk,
@@ -31745,6 +31722,26 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
+"ebt" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/machinery/camera/autoname/almayer{
+ name = "ship-grade camera"
+ },
+/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
+"ebz" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"ebD" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -31874,6 +31871,26 @@
icon_state = "sterile_green"
},
/area/almayer/medical/medical_science)
+"edx" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/sign/safety/maint{
+ pixel_x = 8;
+ pixel_y = -32
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/lifeboat)
+"edM" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/hallways/vehiclehangar)
"eed" = (
/turf/open/floor/almayer{
icon_state = "mono"
@@ -32163,6 +32180,15 @@
dir = 1
},
/area/almayer/medical/containment/cell)
+"eiH" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
"eiK" = (
/obj/structure/bed/chair{
dir = 4
@@ -32323,20 +32349,27 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/operating_room_one)
-"elM" = (
-/obj/structure/bed/chair{
- dir = 8;
- pixel_y = 3
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"elR" = (
/turf/closed/wall/almayer/research/containment/wall/corner{
dir = 1
},
/area/almayer/medical/containment/cell)
+"elX" = (
+/obj/structure/surface/table/almayer,
+/obj/item/trash/uscm_mre,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{
+ pixel_x = -7;
+ pixel_y = 10
+ },
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"eme" = (
/obj/structure/pipes/vents/pump{
dir = 4
@@ -32479,10 +32512,6 @@
},
/area/almayer/hallways/aft_hallway)
"epq" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_full"
- },
/obj/structure/sign/poster{
desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
icon_state = "poster12";
@@ -32490,7 +32519,13 @@
pixel_x = 27;
serial_number = 12
},
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/delta{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"epu" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -32513,6 +32548,18 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_s)
+"epK" = (
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/smg/m39{
+ pixel_y = 6
+ },
+/obj/item/weapon/gun/smg/m39{
+ pixel_y = -6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"eqb" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/stamp/denied{
@@ -32635,6 +32682,14 @@
icon_state = "plate"
},
/area/almayer/shipboard/brig/cryo)
+"erz" = (
+/obj/structure/closet/crate,
+/obj/item/ammo_box/magazine/l42a,
+/obj/item/ammo_box/magazine/l42a,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"erG" = (
/obj/structure/disposalpipe/junction{
dir = 2;
@@ -32678,23 +32733,20 @@
icon_state = "plate"
},
/area/almayer/hallways/starboard_hallway)
-"esC" = (
-/obj/structure/toilet{
- pixel_y = 13
- },
-/obj/item/paper_bin/uscm{
- pixel_x = 9;
- pixel_y = -3
+"esy" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
},
-/obj/structure/machinery/light/small{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/prop/magazine/dirty{
- pixel_x = -6;
- pixel_y = -10
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+ pixel_y = -29
},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/captain_mess)
+/turf/open/floor/almayer{
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"esF" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -32728,14 +32780,6 @@
icon_state = "plating_striped"
},
/area/almayer/command/lifeboat)
-"etn" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"ets" = (
/obj/structure/machinery/power/apc/almayer{
dir = 4
@@ -32791,6 +32835,33 @@
icon_state = "test_floor4"
},
/area/almayer/living/officer_study)
+"euM" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/paper_bin/uscm{
+ pixel_x = -17;
+ pixel_y = 7
+ },
+/obj/item/tool/pen/clicky{
+ pixel_x = -13;
+ pixel_y = -1
+ },
+/obj/item/tool/pen/clicky{
+ pixel_x = -13;
+ pixel_y = 5
+ },
+/obj/structure/machinery/door_control{
+ id = "CO-Office";
+ name = "Door Control";
+ normaldoorcontrol = 1;
+ pixel_y = 7;
+ req_access_txt = "31"
+ },
+/obj/item/ashtray/bronze{
+ pixel_x = 12;
+ pixel_y = 1
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"euN" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out"
@@ -32822,6 +32893,12 @@
icon_state = "logo_c"
},
/area/almayer/command/cic)
+"euY" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/engineering/upper_engineering/port)
"eva" = (
/obj/structure/sign/safety/distribution_pipes{
pixel_x = 32
@@ -32964,6 +33041,12 @@
icon_state = "cargo"
},
/area/almayer/shipboard/brig/cryo)
+"eyv" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south1)
"eyG" = (
/obj/structure/platform,
/turf/open/floor/almayer{
@@ -33112,12 +33195,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/starboard_umbilical)
-"eBE" = (
-/obj/structure/machinery/photocopier{
- anchored = 0
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"eBO" = (
/obj/structure/bed,
/turf/open/floor/almayer{
@@ -33179,8 +33256,6 @@
},
/area/almayer/lifeboat_pumps/south2)
"eCS" = (
-/obj/structure/bed/chair/comfy/delta,
-/obj/item/trash/popcorn,
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 1
},
@@ -33286,17 +33361,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
-"eFG" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/surface/table/almayer,
-/obj/item/tool/hand_labeler,
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "sterile_green_side"
- },
-/area/almayer/medical/chemistry)
"eFH" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_a_s)
@@ -33774,6 +33838,19 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_p)
+"eRt" = (
+/obj/structure/sign/safety/ammunition{
+ pixel_x = 15;
+ pixel_y = 32
+ },
+/obj/structure/sign/safety/hazard{
+ pixel_y = 32
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/hull/lower_hull/l_f_s)
"eRu" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 2
@@ -33841,6 +33918,27 @@
/obj/effect/landmark/crap_item,
/turf/open/floor/almayer,
/area/almayer/living/briefing)
+"eTh" = (
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ name = "General Listening Channel";
+ pixel_y = 28
+ },
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/structure/surface/rack,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/medical/upper_medical)
"eTo" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -33854,6 +33952,13 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
+"eTx" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"eTO" = (
/obj/structure/sign/safety/maint{
pixel_x = -17
@@ -34015,14 +34120,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
-"eXk" = (
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/airoom)
"eXo" = (
/obj/structure/machinery/light/small,
/turf/open/floor/plating/plating_catwalk,
@@ -34034,17 +34131,15 @@
/obj/structure/pipes/vents/pump,
/turf/open/floor/almayer,
/area/almayer/living/offices)
-"eXS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 1
+"eXU" = (
+/obj/structure/bed/chair{
+ dir = 8;
+ pixel_y = 3
},
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_x = 2;
- pixel_y = 2
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_p)
+/area/almayer/hull/upper_hull/u_m_s)
"eYr" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -34177,25 +34272,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/starboard_hallway)
-"faE" = (
-/obj/structure/bookcase{
- icon_state = "book-5";
- name = "law and engineering manuals bookcase";
- opacity = 0
- },
-/obj/item/book/manual/marine_law,
-/obj/item/book/manual/detective,
-/obj/item/book/manual/security_space_law,
-/obj/item/book/manual/engineering_guide,
-/obj/item/book/manual/engineering_construction,
-/obj/item/book/manual/orbital_cannon_manual,
-/obj/item/book/manual/ripley_build_and_repair,
-/obj/item/book/manual/engineering_hacking,
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"faO" = (
/obj/item/stack/cable_coil,
/turf/open/floor/plating/plating_catwalk,
@@ -34457,6 +34533,17 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/operating_room_two)
+"ffl" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/landmark/map_item,
+/obj/item/paper_bin/uscm{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"ffE" = (
/turf/open/floor/almayer/no_build{
icon_state = "plating"
@@ -34580,14 +34667,6 @@
icon_state = "mono"
},
/area/almayer/engineering/upper_engineering/starboard)
-"fhQ" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
-/obj/structure/machinery/light,
-/obj/item/reagent_container/food/condiment/sugar,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/grunt_rnr)
"fiq" = (
/turf/closed/wall/almayer,
/area/almayer/hull/lower_hull/l_m_p)
@@ -34602,6 +34681,27 @@
icon_state = "orange"
},
/area/almayer/engineering/engine_core)
+"fiP" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/storage/fancy/cigar{
+ layer = 3.04;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_container/food/drinks/bottle/sake{
+ pixel_x = -11;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/sake{
+ pixel_x = -2;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/sake{
+ pixel_x = 7;
+ pixel_y = 16
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"fjO" = (
/obj/item/tool/wet_sign,
/obj/effect/decal/cleanable/blood,
@@ -34706,12 +34806,6 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/brig/execution)
-"fnv" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"fnx" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/door/window/eastright{
@@ -34753,6 +34847,18 @@
icon_state = "test_floor4"
},
/area/almayer/squads/req)
+"fnQ" = (
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/machinery/door/window/tinted{
+ dir = 1
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
"fnZ" = (
/obj/structure/machinery/portable_atmospherics/canister/air,
/obj/structure/machinery/light/small{
@@ -34873,6 +34979,12 @@
},
/turf/open/floor/wood/ship,
/area/almayer/command/corporateliason)
+"fqg" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south2)
"fqu" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/almayer,
@@ -34929,20 +35041,6 @@
icon_state = "red"
},
/area/almayer/shipboard/starboard_missiles)
-"frJ" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/sign/safety/ammunition{
- pixel_x = 15;
- pixel_y = 32
- },
-/obj/structure/sign/safety/hazard{
- pixel_y = 32
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"frM" = (
/obj/effect/decal/warning_stripes{
icon_state = "S";
@@ -34956,19 +35054,6 @@
icon_state = "tcomms"
},
/area/almayer/command/airoom)
-"frY" = (
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/l42a{
- pixel_y = 6
- },
-/obj/item/weapon/gun/rifle/l42a,
-/obj/item/weapon/gun/rifle/l42a{
- pixel_y = -6
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"fsd" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -35105,6 +35190,21 @@
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_s)
+"fuR" = (
+/obj/structure/bed/bedroll{
+ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
+ name = "cat bed";
+ pixel_y = 0
+ },
+/mob/living/simple_animal/cat/Jones{
+ dir = 8
+ },
+/obj/structure/machinery/firealarm{
+ pixel_x = -1;
+ pixel_y = 28
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"fuS" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -35416,6 +35516,15 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/lifeboat)
+"fCt" = (
+/obj/structure/bed/chair/comfy/delta{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"fCL" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -35556,6 +35665,16 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/morgue)
+"fFq" = (
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"fFD" = (
/obj/structure/window/reinforced{
dir = 4;
@@ -35591,16 +35710,6 @@
icon_state = "plate"
},
/area/almayer/medical/morgue)
-"fGa" = (
-/obj/structure/surface/rack,
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/numbertwobunks)
"fGg" = (
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/open/floor/almayer,
@@ -35665,6 +35774,17 @@
},
/turf/open/floor/plating,
/area/almayer/hull/lower_hull/l_f_p)
+"fHe" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/prop/helmetgarb/helmet_nvg/cosmetic,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/living/briefing)
"fHh" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -35995,6 +36115,17 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/hangar)
+"fNu" = (
+/obj/structure/surface/table/almayer,
+/obj/item/paper,
+/obj/item/tool/pen{
+ pixel_x = -5;
+ pixel_y = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/living/briefing)
"fNA" = (
/obj/structure/closet/fireaxecabinet{
pixel_y = 32
@@ -36011,21 +36142,19 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/aft_hallway)
+"fOh" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4;
+ icon_state = "exposed01-supply"
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/combat_correspondent)
"fOk" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
},
/turf/open/floor/almayer,
/area/almayer/living/briefing)
-"fOv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"fOz" = (
/obj/structure/target{
name = "punching bag"
@@ -36131,20 +36260,6 @@
/obj/effect/step_trigger/clone_cleaner,
/turf/closed/wall/almayer,
/area/almayer/hull/upper_hull/u_m_p)
-"fQY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/supply/weapons/m39{
- pixel_x = 2
- },
-/obj/structure/largecrate/supply/weapons/m41a{
- layer = 3.1;
- pixel_x = 6;
- pixel_y = 17
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"fRr" = (
/obj/structure/machinery/light{
dir = 1
@@ -36271,18 +36386,6 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/chemistry)
-"fWi" = (
-/obj/structure/toilet{
- dir = 1
- },
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/machinery/door/window/tinted{
- dir = 1
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
"fWT" = (
/obj/structure/machinery/door/airlock/almayer/engineering{
dir = 2;
@@ -36311,6 +36414,16 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/medical/morgue)
+"fXt" = (
+/obj/structure/window/framed/almayer,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ dir = 5;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"fXx" = (
/obj/structure/surface/rack,
/turf/open/floor/almayer{
@@ -36331,33 +36444,17 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer,
/area/almayer/hallways/aft_hallway)
-"fXE" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/emails{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/structure/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
+"fXM" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
},
-/area/almayer/command/combat_correspondent)
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
"fXN" = (
/obj/effect/landmark/start/marine/delta,
/obj/effect/landmark/late_join/delta,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/delta)
-"fXP" = (
-/obj/structure/machinery/camera/autoname/almayer{
- name = "ship-grade camera"
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "silver"
- },
-/area/almayer/command/cichallway)
"fYb" = (
/turf/open/floor/almayer{
dir = 8;
@@ -36569,6 +36666,12 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_p)
+"gcw" = (
+/obj/structure/bed/chair/comfy/bravo,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"gcK" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -36752,6 +36855,10 @@
/obj/structure/machinery/recharge_station,
/turf/open/floor/plating,
/area/almayer/command/airoom)
+"gfK" = (
+/obj/structure/bed/chair/comfy/blue,
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"gfS" = (
/obj/structure/sign/safety/cryo{
pixel_y = -26
@@ -36816,6 +36923,14 @@
/obj/effect/landmark/start/liaison,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_m_p)
+"ghX" = (
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/obj/item/toy/inflatable_duck,
+/obj/structure/window/reinforced,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
"gio" = (
/obj/structure/closet/emcloset,
/obj/structure/sign/safety/restrictedarea{
@@ -36952,12 +37067,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_s)
-"gka" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/hull/lower_hull/l_f_s)
"gks" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor/plating,
@@ -36966,7 +37075,10 @@
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 8
},
-/turf/open/floor/almayer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"gkK" = (
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -37046,6 +37158,16 @@
icon_state = "plate"
},
/area/almayer/shipboard/starboard_point_defense)
+"gmp" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/living/briefing)
"gms" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
@@ -37173,6 +37295,15 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
+"gqF" = (
+/obj/structure/machinery/photocopier,
+/obj/structure/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"gqK" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -37392,12 +37523,6 @@
icon_state = "green"
},
/area/almayer/squads/req)
-"gvW" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/hull/upper_hull/u_f_p)
"gwm" = (
/obj/structure/largecrate/random/case/small,
/obj/item/device/taperecorder{
@@ -37424,6 +37549,15 @@
icon_state = "bluecorner"
},
/area/almayer/living/basketball)
+"gwu" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/warning_stripes{
+ icon_state = "SE-out"
+ },
+/turf/open/floor/almayer{
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"gww" = (
/obj/structure/bed/chair,
/obj/structure/machinery/light{
@@ -37564,6 +37698,12 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"gye" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors,
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/cic)
"gyt" = (
/obj/item/storage/firstaid/regular,
/obj/structure/surface/rack,
@@ -37623,13 +37763,6 @@
icon_state = "orange"
},
/area/almayer/engineering/ce_room)
-"gyU" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer,
-/area/almayer/lifeboat_pumps/north2)
"gzn" = (
/obj/structure/machinery/landinglight/ds2/delaytwo{
dir = 8
@@ -37823,19 +37956,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
-"gCB" = (
-/obj/structure/machinery/power/apc/almayer/hardened{
- cell_type = /obj/item/cell/hyper;
- dir = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north2)
"gCI" = (
/obj/structure/machinery/light{
dir = 4
@@ -37855,14 +37975,16 @@
icon_state = "plate"
},
/area/almayer/living/bridgebunks)
-"gDP" = (
-/obj/structure/closet/crate,
-/obj/item/ammo_box/magazine/l42a,
-/obj/item/ammo_box/magazine/l42a,
-/turf/open/floor/almayer{
- icon_state = "plate"
+"gDq" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
},
-/area/almayer/hull/upper_hull/u_m_s)
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 2
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
"gDW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -37896,6 +38018,36 @@
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering/port)
+"gEI" = (
+/obj/item/device/flashlight/lamp/green{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/structure/machinery/door_control{
+ id = "cl_shutters";
+ name = "Privacy Shutters";
+ pixel_x = -5;
+ pixel_y = 8;
+ req_access_txt = "200"
+ },
+/obj/structure/machinery/door_control{
+ id = "RoomDivider";
+ name = "Room Divider";
+ pixel_x = -5;
+ pixel_y = -4;
+ req_access_txt = "200"
+ },
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/door_control{
+ id = "cl_evac";
+ name = "Evac Pod Door Control";
+ normaldoorcontrol = 1;
+ pixel_x = -5;
+ pixel_y = 2;
+ req_access_txt = "200"
+ },
+/turf/open/floor/carpet,
+/area/almayer/command/corporateliason)
"gEK" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -37943,22 +38095,38 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
-"gGp" = (
+"gGl" = (
/obj/structure/surface/table/almayer,
-/obj/item/clothing/mask/cigarette/pipe{
- pixel_x = 8
+/obj/item/device/taperecorder,
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/obj/structure/transmitter/rotary{
- name = "Reporter Telephone";
- phone_category = "Almayer";
- phone_id = "Reporter";
+/area/almayer/command/combat_correspondent)
+"gGo" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/firealarm{
+ pixel_y = 28
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8;
+ pixel_x = 29
+ },
+/obj/item/reagent_container/food/condiment/hotsauce/cholula{
+ pixel_x = 10;
+ pixel_y = 14
+ },
+/obj/item/trash/USCMtray{
pixel_x = -4;
- pixel_y = 6
+ pixel_y = 4
+ },
+/obj/item/reagent_container/food/snacks/hotdog{
+ pixel_x = -7;
+ pixel_y = 5
},
/turf/open/floor/almayer{
icon_state = "plate"
},
-/area/almayer/command/combat_correspondent)
+/area/almayer/living/briefing)
"gGr" = (
/obj/structure/machinery/vending/cigarette,
/turf/open/floor/almayer{
@@ -38091,6 +38259,12 @@
icon_state = "orange"
},
/area/almayer/engineering/lower_engineering)
+"gJs" = (
+/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend,
+/turf/open/floor/almayer{
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"gJP" = (
/obj/structure/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -38120,10 +38294,10 @@
},
/area/almayer/shipboard/port_missiles)
"gKH" = (
-/obj/structure/bed/chair/comfy/charlie,
/obj/item/trash/uscm_mre,
+/obj/structure/bed/chair/comfy/charlie,
/turf/open/floor/almayer{
- icon_state = "emeraldfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"gKJ" = (
@@ -38303,7 +38477,6 @@
},
/area/almayer/engineering/engine_core)
"gNi" = (
-/obj/structure/bed/chair/comfy/delta,
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
},
@@ -38336,6 +38509,18 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_p)
+"gOm" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"gOs" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -38546,6 +38731,14 @@
icon_state = "green"
},
/area/almayer/living/grunt_rnr)
+"gUr" = (
+/obj/item/stack/folding_barricade/three,
+/obj/item/stack/folding_barricade/three,
+/obj/structure/surface/rack,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/hull/lower_hull/l_f_s)
"gUv" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -38605,18 +38798,18 @@
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/north2)
-"gVd" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/folder/black{
- pixel_y = 8
+"gVm" = (
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 4
},
-/obj/item/folder/yellow,
-/obj/item/device/flashlight/lamp/green{
- pixel_y = 8;
- pixel_x = -16
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/arcturianstopsign{
+ pixel_y = 32
},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"gVq" = (
/obj/structure/machinery/light,
/obj/effect/decal/warning_stripes{
@@ -38898,16 +39091,6 @@
icon_state = "silver"
},
/area/almayer/living/auxiliary_officer_office)
-"hbI" = (
-/obj/structure/sign/safety/ammunition{
- pixel_x = 32;
- pixel_y = 7
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/medical/upper_medical)
"hbZ" = (
/obj/structure/surface/table/almayer,
/obj/structure/sign/safety/terminal{
@@ -38993,16 +39176,6 @@
"hcZ" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/offices)
-"hdb" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
"hdd" = (
/turf/open/floor/almayer{
dir = 9;
@@ -39083,6 +39256,13 @@
icon_state = "plate"
},
/area/almayer/engineering/engine_core)
+"hey" = (
+/obj/effect/decal/cleanable/blood/oil/streak,
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south1)
"heK" = (
/obj/structure/machinery/door/airlock/almayer/maint{
dir = 1;
@@ -39138,6 +39318,22 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
+"hfw" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/obj/structure/machinery/camera/autoname/almayer{
+ dir = 1;
+ name = "ship-grade camera"
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer{
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"hfy" = (
/obj/structure/machinery/light,
/turf/open/floor/plating/plating_catwalk,
@@ -39283,14 +39479,6 @@
},
/turf/open/floor/plating,
/area/almayer/hull/lower_hull/l_f_p)
-"hiy" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 2
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/lifeboat_pumps/north1)
"hiB" = (
/obj/structure/pipes/vents/pump{
dir = 1
@@ -39304,6 +39492,13 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cic_hallway)
+"hiN" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
"hiQ" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 8
@@ -39354,6 +39549,13 @@
icon_state = "test_floor4"
},
/area/almayer/living/grunt_rnr)
+"hjT" = (
+/obj/structure/bed/chair/comfy/alpha,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"hki" = (
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
/turf/open/floor/almayer{
@@ -39526,19 +39728,17 @@
icon_state = "sterile_green"
},
/area/almayer/medical/hydroponics)
-"hnI" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 2
- },
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
- access_modified = 1;
- name = "\improper Flight Crew Quarters";
- req_one_access_txt = "19;22"
+"hnH" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop/magazine/boots/n117{
+ pixel_x = 2;
+ pixel_y = 5
},
/turf/open/floor/almayer{
- icon_state = "test_floor4"
+ icon_state = "bluefull"
},
-/area/almayer/living/pilotbunks)
+/area/almayer/living/briefing)
"hnV" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer,
@@ -39572,6 +39772,19 @@
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_10"
},
+/obj/structure/closet/secure_closet/cmdcabinet{
+ pixel_y = 24;
+ desc = "A bulletproof cabinet containing communications equipment.";
+ name = "communications cabinet";
+ req_access = null;
+ req_one_access_txt = "207;203"
+ },
+/obj/item/device/radio,
+/obj/item/device/radio/listening_bug/radio_linked/wy,
+/obj/item/device/radio/listening_bug/radio_linked/wy{
+ pixel_x = 4;
+ pixel_y = -3
+ },
/turf/open/floor/wood/ship,
/area/almayer/command/corporateliason)
"hpk" = (
@@ -39729,18 +39942,6 @@
icon_state = "test_floor4"
},
/area/almayer/engineering/upper_engineering/starboard)
-"htG" = (
-/obj/item/tool/soap,
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/engineering/upper_engineering/port)
"htI" = (
/obj/structure/platform_decoration{
dir = 1
@@ -39772,6 +39973,18 @@
icon_state = "silver"
},
/area/almayer/command/computerlab)
+"huR" = (
+/obj/structure/sign/prop1{
+ pixel_y = 32
+ },
+/obj/structure/filingcabinet/security{
+ pixel_x = -8
+ },
+/obj/structure/filingcabinet/medical{
+ pixel_x = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"huU" = (
/obj/structure/machinery/door/airlock/almayer/security{
access_modified = 1;
@@ -39982,13 +40195,6 @@
"hyQ" = (
/turf/closed/wall/almayer,
/area/almayer/living/synthcloset)
-"hzb" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4;
- icon_state = "exposed01-supply"
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/combat_correspondent)
"hzc" = (
/turf/closed/wall/almayer/outer,
/area/almayer/engineering/upper_engineering/notunnel)
@@ -40156,12 +40362,6 @@
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/hangar)
-"hBL" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/lifeboat)
"hBU" = (
/obj/structure/largecrate/random/secure,
/obj/effect/decal/warning_stripes{
@@ -40171,6 +40371,25 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_p)
+"hBW" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/device/flashlight/lamp/green{
+ pixel_x = -7;
+ pixel_y = 20
+ },
+/obj/item/ashtray/bronze{
+ pixel_x = 4;
+ pixel_y = 19
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/landmark/map_item{
+ pixel_x = -1;
+ pixel_y = 3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"hCo" = (
/obj/structure/surface/table/almayer,
/obj/structure/flora/pottedplant{
@@ -40309,14 +40528,23 @@
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_p)
-"hGB" = (
-/obj/structure/machinery/light,
-/obj/structure/flora/pottedplant{
- pixel_y = 3;
- pixel_x = -1
+"hFX" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 4
},
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
+"hGa" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"hGD" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -40403,6 +40631,23 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_p)
+"hIt" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/kitchen/tray{
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lamp{
+ pixel_x = 15
+ },
+/obj/item/reagent_container/food/snacks/meatpizzaslice{
+ pixel_x = -5;
+ pixel_y = 7
+ },
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"hII" = (
/obj/structure/machinery/cm_vending/gear/tl{
density = 0;
@@ -40438,6 +40683,19 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_s)
+"hJh" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/obj/structure/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"hJk" = (
/obj/structure/stairs/perspective{
dir = 4;
@@ -40511,61 +40769,6 @@
icon_state = "cargo_arrow"
},
/area/almayer/engineering/engineering_workshop/hangar)
-"hLB" = (
-/obj/structure/machinery/light/small{
- dir = 1
- },
-/obj/structure/closet/crate,
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
"hLC" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer{
@@ -40620,6 +40823,14 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
+"hMJ" = (
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"hMN" = (
/obj/structure/machinery/power/apc/almayer,
/turf/open/floor/almayer{
@@ -40752,6 +40963,13 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/charlie_delta_shared)
+"hQh" = (
+/obj/structure/machinery/light,
+/obj/structure/closet/secure_closet/fridge/groceries/stock,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"hQU" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -41114,12 +41332,24 @@
icon_state = "blue"
},
/area/almayer/command/cichallway)
+"hWS" = (
+/obj/structure/closet/secure_closet/fridge/organic/stock,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"hWU" = (
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
+"hWX" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/hull/upper_hull/u_f_p)
"hXb" = (
/turf/open/floor/almayer{
dir = 1;
@@ -41157,18 +41387,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cic_hallway)
-"hXG" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
+"hXD" = (
/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
+ icon_state = "SW-out";
+ pixel_x = -1
},
/turf/open/floor/almayer{
- icon_state = "dark_sterile"
+ icon_state = "mono"
},
-/area/almayer/engineering/upper_engineering/port)
+/area/almayer/lifeboat_pumps/south1)
"hXS" = (
/obj/structure/sign/safety/water{
pixel_x = 8;
@@ -41259,12 +41486,6 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/main_office)
-"iaa" = (
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"iag" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/hand_labeler,
@@ -41315,6 +41536,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/port)
+"iaE" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
"iaF" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 4
@@ -41386,6 +41613,22 @@
icon_state = "kitchen"
},
/area/almayer/living/grunt_rnr)
+"idJ" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/paper,
+/obj/item/tool/pen{
+ pixel_x = -5;
+ pixel_y = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "orangefull"
+ },
+/area/almayer/living/briefing)
"idX" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor/prison{
@@ -41502,6 +41745,15 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/north1)
+"ift" = (
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/structure/surface/rack,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/engineering/upper_engineering)
"ifR" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -41517,6 +41769,12 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
+"ign" = (
+/obj/structure/closet/secure_closet/fridge/fish/stock,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"igp" = (
/obj/structure/surface/table/almayer,
/obj/item/device/flashlight/lamp{
@@ -41604,6 +41862,19 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_m_p)
+"iii" = (
+/obj/structure/sign/safety/ammunition{
+ pixel_x = 15;
+ pixel_y = -32
+ },
+/obj/structure/sign/safety/hazard{
+ pixel_y = -32
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/squads/req)
"iit" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -41808,13 +42079,14 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/living/offices/flight)
-"imJ" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
+"imW" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
},
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"ina" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/emails{
@@ -42066,6 +42338,18 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
+"isu" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/item/bedsheet/hop{
+ pixel_y = 0
+ },
+/obj/structure/bed{
+ pixel_y = 0
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"isC" = (
/obj/effect/projector{
name = "Almayer_AresDown";
@@ -42093,17 +42377,6 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/general_equipment)
-"isI" = (
-/obj/structure/sign/nosmoking_2{
- pixel_x = 32
- },
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 2
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/lifeboat_pumps/north1)
"isN" = (
/obj/structure/sink{
dir = 8;
@@ -42115,6 +42388,17 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/morgue)
+"isS" = (
+/obj/item/stack/sheet/cardboard{
+ amount = 50
+ },
+/obj/structure/surface/rack,
+/obj/item/packageWrap,
+/turf/open/floor/almayer{
+ dir = 4;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"isW" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
pixel_y = 25
@@ -42204,6 +42488,16 @@
},
/turf/open/floor/plating,
/area/almayer/hull/lower_hull/l_f_p)
+"iuw" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 9;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering/port)
"iuz" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/warhead,
@@ -42221,6 +42515,16 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"iuT" = (
+/obj/structure/closet/emcloset,
+/obj/structure/machinery/camera/autoname/almayer{
+ dir = 4;
+ name = "ship-grade camera"
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/hull/upper_hull/u_f_s)
"ivf" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/item/device/camera,
@@ -42313,15 +42617,6 @@
/obj/structure/bed/chair/comfy/beige,
/turf/open/floor/carpet,
/area/almayer/command/cichallway)
-"iwZ" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/fancy/cigarettes/lucky_strikes,
-/obj/item/packageWrap,
-/turf/open/floor/almayer{
- dir = 9;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"ixj" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/crew/alt,
@@ -42437,14 +42732,14 @@
},
/area/almayer/living/offices)
"izr" = (
-/obj/structure/bed/chair/comfy/alpha{
- dir = 1
- },
/obj/structure/sign/poster/propaganda{
pixel_x = -27
},
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 1
+ },
/turf/open/floor/almayer{
- icon_state = "redfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"izx" = (
@@ -42657,12 +42952,12 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_a_p)
-"iEz" = (
-/obj/structure/machinery/light,
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_21";
- pixel_y = 3
+"iET" = (
+/obj/structure/machinery/light{
+ dir = 1
},
+/obj/structure/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
"iFc" = (
@@ -42710,6 +43005,21 @@
},
/turf/open/floor/wood/ship,
/area/almayer/shipboard/sea_office)
+"iFG" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/deployable{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"iFH" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
@@ -42799,6 +43109,18 @@
icon_state = "kitchen"
},
/area/almayer/living/grunt_rnr)
+"iIm" = (
+/obj/structure/machinery/door/airlock/almayer/generic{
+ dir = 2;
+ name = "\improper Bathroom"
+ },
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/commandbunks)
"iIP" = (
/obj/structure/toilet{
pixel_y = 16
@@ -43009,13 +43331,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
-"iNY" = (
-/obj/structure/machinery/status_display{
- pixel_x = 32;
- pixel_y = 16
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"iNZ" = (
/obj/structure/machinery/light{
dir = 8
@@ -43040,18 +43355,6 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
-"iPu" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/item/bedsheet/hop{
- pixel_y = 0
- },
-/obj/structure/bed{
- pixel_y = 0
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"iPv" = (
/obj/structure/bed/chair/comfy,
/obj/structure/window/reinforced/ultra,
@@ -43251,25 +43554,6 @@
/obj/item/facepaint/black,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/alpha)
-"iTd" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south2)
-"iTe" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"iTf" = (
/obj/structure/closet/crate/trashcart,
/obj/item/clothing/gloves/yellow,
@@ -43366,6 +43650,14 @@
icon_state = "mono"
},
/area/almayer/medical/hydroponics)
+"iUC" = (
+/obj/structure/machinery/faxmachine,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/light/small,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"iUW" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -43414,6 +43706,16 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
+"iWb" = (
+/obj/structure/sign/safety/hazard{
+ pixel_x = 32;
+ pixel_y = -8
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/medical/upper_medical)
"iWc" = (
/obj/structure/surface/table/almayer,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -43444,13 +43746,18 @@
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
"iWE" = (
-/obj/structure/platform{
- dir = 1
- },
/obj/structure/pipes/vents/pump{
dir = 4
},
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 4
+ },
+/obj/structure/barricade/deployable{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "orangefull"
+ },
/area/almayer/living/briefing)
"iWL" = (
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -43479,6 +43786,11 @@
icon_state = "bluefull"
},
/area/almayer/living/briefing)
+"iXd" = (
+/turf/open/floor/almayer{
+ icon_state = "orangefull"
+ },
+/area/almayer/living/briefing)
"iXt" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
@@ -43486,6 +43798,15 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/processing)
+"iXR" = (
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"iXT" = (
/obj/item/trash/uscm_mre,
/turf/open/floor/almayer,
@@ -43577,6 +43898,15 @@
icon_state = "plate"
},
/area/almayer/living/gym)
+"iYR" = (
+/obj/structure/closet/secure_closet/bar{
+ name = "Success Cabinet";
+ req_access_txt = "1"
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/captain_mess)
"iZg" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -43672,15 +44002,6 @@
icon_state = "plating"
},
/area/almayer/command/airoom)
-"jaK" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hallways/vehiclehangar)
"jaP" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/cameras/almayer_network{
@@ -43798,6 +44119,19 @@
icon_state = "plating_striped"
},
/area/almayer/engineering/upper_engineering/starboard)
+"jcZ" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 9;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"jdk" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 6
@@ -44026,28 +44360,22 @@
icon_state = "test_floor4"
},
/area/almayer/living/auxiliary_officer_office)
-"jgr" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/camera{
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/paper_bin/uscm{
- pixel_x = 6;
- pixel_y = 6
+"jgu" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
},
-/obj/item/tool/pen{
- pixel_x = 4;
- pixel_y = -4
+/obj/structure/mirror{
+ pixel_x = 29
},
-/obj/item/storage/box/donkpockets{
- pixel_x = -8;
- pixel_y = -1
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
},
/turf/open/floor/almayer{
- icon_state = "plate"
+ icon_state = "dark_sterile"
},
-/area/almayer/command/combat_correspondent)
+/area/almayer/living/captain_mess)
"jgw" = (
/obj/structure/sign/safety/nonpress_0g{
pixel_x = 32
@@ -44130,21 +44458,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
-"jhB" = (
-/obj/structure/bookcase{
- icon_state = "book-5";
- name = "medical manuals bookcase";
- opacity = 0
- },
-/obj/item/book/manual/surgery,
-/obj/item/book/manual/research_and_development,
-/obj/item/book/manual/medical_diagnostics_manual,
-/obj/item/book/manual/medical_cloning,
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"jhD" = (
/obj/structure/machinery/firealarm{
pixel_y = -28
@@ -44314,6 +44627,11 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
+"jkL" = (
+/obj/structure/surface/table/almayer,
+/obj/item/tool/weldingtool,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
"jkS" = (
/obj/structure/window/framed/almayer/hull/hijack_bustable,
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -44498,12 +44816,36 @@
/obj/structure/machinery/door/firedoor/border_only/almayer,
/turf/open/floor/plating,
/area/almayer/command/cic)
+"jog" = (
+/obj/structure/surface/table/almayer,
+/obj/item/storage/photo_album{
+ pixel_x = -4;
+ pixel_y = 5
+ },
+/obj/item/folder/black{
+ pixel_x = 7;
+ pixel_y = -3
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"jox" = (
/obj/structure/machinery/brig_cell/cell_3{
pixel_x = -32
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/processing)
+"joE" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
+/turf/open/floor/almayer{
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"joG" = (
/obj/structure/machinery/washing_machine,
/obj/structure/sign/poster{
@@ -44613,6 +44955,16 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
+"jrV" = (
+/obj/structure/surface/table/almayer,
+/obj/item/weapon/gun/rifle/l42a{
+ pixel_y = 6
+ },
+/obj/item/weapon/gun/rifle/l42a,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"jss" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -44662,6 +45014,12 @@
icon_state = "greencorner"
},
/area/almayer/hallways/starboard_hallway)
+"juf" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north1)
"jup" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -44827,13 +45185,6 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/processing)
-"jxP" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- pixel_x = -1
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/vehiclehangar)
"jyi" = (
/obj/structure/machinery/power/port_gen/pacman,
/turf/open/floor/almayer{
@@ -44861,15 +45212,6 @@
icon_state = "test_floor4"
},
/area/almayer/engineering/upper_engineering/notunnel)
-"jzE" = (
-/obj/structure/closet/secure_closet/bar{
- name = "Success Cabinet";
- req_access_txt = "1"
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/captain_mess)
"jzZ" = (
/obj/structure/platform_decoration,
/turf/open/floor/almayer{
@@ -44964,6 +45306,36 @@
icon_state = "test_floor4"
},
/area/almayer/command/lifeboat)
+"jBY" = (
+/obj/structure/surface/rack,
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0;
+ pixel_x = -6;
+ pixel_y = 7
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0;
+ pixel_x = -6;
+ pixel_y = -3
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0;
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0;
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/structure/noticeboard{
+ desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'";
+ pixel_y = 29
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"jCa" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -44972,6 +45344,15 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/main_office)
+"jCn" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"jCK" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecalbottomleft";
@@ -45017,6 +45398,27 @@
},
/turf/open/floor/plating,
/area/almayer/hull/lower_hull/l_f_p)
+"jEI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/computer/cameras/wooden_tv/prop{
+ pixel_y = 29
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
+"jEX" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/folder/black{
+ pixel_y = 8
+ },
+/obj/item/folder/yellow,
+/obj/item/device/flashlight/lamp/green{
+ pixel_x = -16;
+ pixel_y = 8
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"jFe" = (
/obj/structure/prop/holidays/string_lights{
pixel_y = 27
@@ -45074,12 +45476,6 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_a_s)
-"jFY" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/engineering/upper_engineering/port)
"jGn" = (
/obj/structure/machinery/light{
dir = 1
@@ -45166,6 +45562,15 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/medical/morgue)
+"jIG" = (
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"jIV" = (
/obj/structure/surface/rack,
/obj/item/book/manual/marine_law{
@@ -45372,16 +45777,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hull/upper_hull/u_f_s)
-"jMx" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "SW-out"
- },
-/obj/structure/sign/safety/bathunisex{
- pixel_x = 11;
- pixel_y = -26
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"jMG" = (
/obj/structure/largecrate/random/case/small,
/obj/structure/largecrate/random/mini/wooden{
@@ -45465,12 +45860,13 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
-"jND" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
+"jNY" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_18";
+ pixel_y = 12
},
-/turf/open/floor/wood/ship,
+/turf/open/floor/carpet,
/area/almayer/living/commandbunks)
"jOi" = (
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -45559,6 +45955,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_a_s)
+"jPn" = (
+/obj/structure/machinery/photocopier{
+ anchored = 0
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"jPq" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/almayer{
@@ -45610,6 +46012,15 @@
icon_state = "plate"
},
/area/almayer/hallways/hangar)
+"jRZ" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/engineering/upper_engineering)
"jSo" = (
/obj/item/tool/warning_cone,
/turf/open/floor/almayer{
@@ -45741,9 +46152,6 @@
/turf/open/floor/almayer,
/area/almayer/engineering/engineering_workshop/hangar)
"jUo" = (
-/obj/structure/bed/chair/comfy/bravo{
- dir = 1
- },
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/almayer{
icon_state = "orangefull"
@@ -45871,6 +46279,29 @@
icon_state = "plate"
},
/area/almayer/living/offices)
+"jWC" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
+"jWH" = (
+/obj/structure/machinery/power/apc/almayer/hardened{
+ cell_type = /obj/item/cell/hyper;
+ dir = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north1)
"jWU" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -45899,54 +46330,18 @@
icon_state = "plating"
},
/area/almayer/hallways/vehiclehangar)
+"jXW" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/lifeboat)
"jXY" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
-"jYc" = (
-/obj/item/bedsheet/blue{
- layer = 3.2
- },
-/obj/item/bedsheet/blue{
- pixel_y = 13
- },
-/obj/item/toy/plush/therapy/red{
- desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
- force = 15;
- layer = 4.1;
- name = "Sergeant Huggs";
- pixel_y = 15;
- throwforce = 15
- },
-/obj/item/clothing/head/cmcap{
- layer = 4.1;
- pixel_x = -1;
- pixel_y = 22
- },
-/obj/structure/window/reinforced{
- dir = 4;
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/structure/window/reinforced{
- dir = 8;
- layer = 3.3;
- pixel_y = 4
- },
-/obj/structure/bed{
- can_buckle = 0
- },
-/obj/structure/bed{
- buckling_y = 13;
- layer = 3.5;
- pixel_y = 13
- },
-/turf/open/floor/almayer{
- icon_state = "blue"
- },
-/area/almayer/living/port_emb)
"jYd" = (
/obj/structure/machinery/gear{
id = "vehicle_elevator_gears"
@@ -45987,6 +46382,16 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/processing)
+"jZr" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/living/briefing)
"jZs" = (
/obj/structure/machinery/light/containment{
dir = 4
@@ -46131,20 +46536,20 @@
icon_state = "bluefull"
},
/area/almayer/squads/charlie_delta_shared)
+"kaJ" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"kaN" = (
/obj/structure/platform{
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_a_p)
-"kaS" = (
-/obj/structure/bed/chair/office/dark{
- dir = 8
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"kbc" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -46257,14 +46662,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
-"kdv" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering/starboard)
"kdB" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -46276,27 +46673,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/engineering/upper_engineering/starboard)
-"keT" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/storage/fancy/cigar{
- pixel_y = 2;
- layer = 3.04;
- pixel_x = -2
- },
-/obj/item/reagent_container/food/drinks/bottle/sake{
- pixel_x = -11;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/sake{
- pixel_y = 16;
- pixel_x = -2
- },
-/obj/item/reagent_container/food/drinks/bottle/sake{
- pixel_x = 7;
- pixel_y = 16
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kff" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer{
@@ -46324,6 +46700,16 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"kfG" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ pixel_x = 15
+ },
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
+ },
+/area/almayer/living/briefing)
"kfN" = (
/obj/structure/closet/secure_closet/brig,
/turf/open/floor/almayer{
@@ -46336,17 +46722,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/starboard_hallway)
-"kfR" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_x = -1;
- pixel_y = 2
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
"kfU" = (
/turf/open/floor/plating,
/area/almayer/powered/agent)
@@ -46448,6 +46823,12 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
+"khX" = (
+/obj/structure/closet/secure_closet/fridge/dry/stock,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"kif" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -46552,6 +46933,15 @@
icon_state = "plating"
},
/area/almayer/engineering/engine_core)
+"klG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"klH" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 4
@@ -46569,12 +46959,6 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
-"kmk" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/hallways/vehiclehangar)
"kmp" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -46627,6 +47011,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_f_s)
+"kmY" = (
+/obj/structure/pipes/vents/pump{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"kng" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -46651,12 +47041,10 @@
/obj/structure/machinery/light,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/grunt_rnr)
-"knL" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/lifeboat_pumps/south2)
+"knT" = (
+/obj/structure/safe/cl_office,
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
"koc" = (
/obj/structure/machinery/status_display{
pixel_y = -30
@@ -46910,15 +47298,12 @@
icon_state = "cargo"
},
/area/almayer/squads/bravo)
-"ksA" = (
-/obj/structure/closet/secure_closet/freezer/fridge/groceries,
-/obj/structure/machinery/light{
- dir = 8
- },
+"ksv" = (
+/obj/structure/closet/secure_closet/securecom,
/turf/open/floor/almayer{
- icon_state = "plate"
+ icon_state = "redfull"
},
-/area/almayer/living/grunt_rnr)
+/area/almayer/command/cic)
"ksN" = (
/turf/open/floor/almayer/uscm/directional{
dir = 6
@@ -46955,17 +47340,12 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/evidence_storage)
-"ktn" = (
+"ktc" = (
/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
+ icon_state = "S"
},
-/area/almayer/shipboard/brig/armory)
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"ktB" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/almayer{
@@ -47109,6 +47489,13 @@
icon_state = "dark_sterile"
},
/area/almayer/engineering/laundry)
+"kxF" = (
+/obj/structure/bed/chair/comfy/charlie,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"kxL" = (
/obj/structure/closet/coffin/woodencrate,
/obj/structure/largecrate/random/mini/wooden{
@@ -47422,10 +47809,6 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/processing)
-"kDK" = (
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kDR" = (
/obj/structure/disposalpipe/junction{
dir = 1;
@@ -47645,12 +48028,6 @@
icon_state = "plate"
},
/area/almayer/squads/alpha)
-"kJm" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kJC" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -47692,19 +48069,6 @@
icon_state = "green"
},
/area/almayer/hallways/port_hallway)
-"kJW" = (
-/obj/structure/machinery/door/window/westright,
-/obj/structure/machinery/shower{
- dir = 8;
- layer = 3.10;
- plane = -4
- },
-/obj/item/tool/soap{
- pixel_x = 2;
- pixel_y = 7
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/commandbunks)
"kKb" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -47751,11 +48115,20 @@
},
/area/almayer/hull/lower_hull/l_f_s)
"kKL" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/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 = -27;
+ serial_number = 11
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/almayer,
/area/almayer/living/briefing)
"kKR" = (
/obj/structure/pipes/vents/pump{
@@ -47873,18 +48246,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/briefing)
-"kNq" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/faxmachine/uscm/command/capt{
- name = "Commanding Officer's Fax Machine";
- pixel_y = 3;
- pixel_x = -4
- },
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kNx" = (
/obj/structure/sign/safety/ref_bio_storage{
pixel_x = -17;
@@ -48035,12 +48396,6 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/starboard)
-"kPH" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer,
-/area/almayer/lifeboat_pumps/south2)
"kPJ" = (
/obj/structure/machinery/cryopod/right{
pixel_y = 6
@@ -48093,11 +48448,13 @@
/obj/structure/bed/chair/comfy/bravo{
dir = 1
},
-/obj/structure/machinery/light{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8;
+ pixel_x = 29
},
/turf/open/floor/almayer{
- icon_state = "orangefull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"kRd" = (
@@ -48109,12 +48466,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/operating_room_three)
-"kRg" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/lifeboat)
"kRu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48166,18 +48517,6 @@
icon_state = "tcomms"
},
/area/almayer/command/airoom)
-"kSH" = (
-/obj/structure/sign/prop1{
- pixel_y = 32
- },
-/obj/structure/filingcabinet/security{
- pixel_x = -8
- },
-/obj/structure/filingcabinet/medical{
- pixel_x = 8
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kSJ" = (
/obj/structure/disposalpipe/junction{
dir = 4;
@@ -48207,16 +48546,6 @@
icon_state = "plating"
},
/area/almayer/squads/req)
-"kTc" = (
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"kTq" = (
/obj/structure/largecrate/supply/supplies/mre,
/turf/open/floor/almayer{
@@ -48233,14 +48562,16 @@
},
/area/almayer/command/telecomms)
"kTx" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_full"
- },
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
},
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"kTM" = (
/obj/item/frame/rack{
@@ -48272,18 +48603,23 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
-"kUh" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
- access_modified = 1;
- dir = 1;
- name = "\improper Flight Crew Quarters";
- req_one_access_txt = "19;22"
- },
+"kUb" = (
+/obj/structure/closet/secure_closet,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/storage/box/tapes,
+/obj/item/clothing/head/fedora,
+/obj/item/clothing/suit/storage/marine/light/reporter,
+/obj/item/clothing/head/helmet/marine/reporter,
+/obj/item/clothing/head/cmcap/reporter,
+/obj/item/device/flashlight,
+/obj/item/device/toner,
+/obj/item/device/toner,
/turf/open/floor/almayer{
- icon_state = "test_floor4"
+ icon_state = "plate"
},
-/area/almayer/living/pilotbunks)
+/area/almayer/command/combat_correspondent)
"kUt" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -48328,27 +48664,6 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/south2)
-"kVT" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/tool/stamp/hop{
- name = "Commanding Officer's rubber stamp";
- pixel_x = -5;
- pixel_y = 9
- },
-/obj/item/paper_bin/uscm{
- pixel_y = 6;
- pixel_x = 7
- },
-/obj/item/tool/pen/red/clicky{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/tool/pen/blue/clicky{
- pixel_x = -6;
- pixel_y = -3
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kVX" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -48447,6 +48762,13 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
+"kXH" = (
+/obj/structure/bed/chair/comfy/delta,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
+ },
+/area/almayer/living/briefing)
"kXJ" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/computer/secure_data{
@@ -48528,12 +48850,6 @@
icon_state = "orange"
},
/area/almayer/hallways/port_umbilical)
-"kZH" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
"kZN" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/prop/almayer/computer/PC{
@@ -48558,6 +48874,23 @@
icon_state = "mono"
},
/area/almayer/medical/hydroponics)
+"lad" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/tool/kitchen/tray{
+ pixel_y = 9
+ },
+/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza{
+ pixel_y = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"lah" = (
/turf/open/floor/almayer{
dir = 6;
@@ -48584,6 +48917,15 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_m_p)
+"laG" = (
+/obj/structure/safe/co_office,
+/obj/item/weapon/pole/fancy_cane,
+/obj/item/tool/lighter/zippo/gold{
+ layer = 3.05;
+ pixel_y = 3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"laO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48627,16 +48969,6 @@
},
/turf/open/floor/plating,
/area/almayer/command/cic)
-"laY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 4;
- pixel_y = -3
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"lbb" = (
/obj/structure/surface/table/almayer,
/obj/item/organ/heart/prosthetic{
@@ -48712,8 +49044,9 @@
/area/almayer/shipboard/brig/chief_mp_office)
"ldj" = (
/obj/structure/pipes/vents/pump,
-/obj/structure/platform,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
/area/almayer/living/briefing)
"ldl" = (
/obj/structure/sign/safety/maint{
@@ -48846,6 +49179,14 @@
icon_state = "plating"
},
/area/almayer/engineering/engine_core)
+"lfT" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/computer/card{
+ dir = 4;
+ pixel_x = 2
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"lfW" = (
/obj/structure/sign/safety/high_voltage{
pixel_y = -32
@@ -49035,6 +49376,15 @@
/obj/effect/landmark/late_join/bravo,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/bravo)
+"ljz" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair/comfy/delta{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"ljG" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_container/food/condiment/coldsauce,
@@ -49083,12 +49433,6 @@
icon_state = "red"
},
/area/almayer/living/offices/flight)
-"lkm" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/engineering/upper_engineering/starboard)
"lkM" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -49113,6 +49457,22 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
+"llt" = (
+/obj/structure/machinery/conveyor{
+ id = "req_belt"
+ },
+/obj/structure/plasticflaps,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer,
+/area/almayer/squads/req)
+"llD" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 5
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/combat_correspondent)
"llM" = (
/obj/structure/pipes/vents/scrubber,
/turf/open/floor/almayer,
@@ -49209,6 +49569,11 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
+"lnZ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"lok" = (
/obj/structure/machinery/cm_vending/clothing/marine/charlie{
density = 0;
@@ -49496,11 +49861,6 @@
icon_state = "plating_striped"
},
/area/almayer/squads/req)
-"ltc" = (
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/airoom)
"lto" = (
/obj/structure/machinery/iv_drip,
/turf/open/floor/almayer{
@@ -49527,14 +49887,6 @@
},
/turf/open/floor/plating,
/area/almayer/hull/upper_hull/u_m_p)
-"ltU" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"ltX" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -49550,17 +49902,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_p)
-"lul" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
- name = "\improper Commanding Officer's Quarters";
- req_access = null;
- req_access_txt = "31"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/commandbunks)
"lut" = (
/obj/structure/machinery/computer/crew,
/turf/open/floor/almayer{
@@ -49853,6 +50194,61 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
+"lAj" = (
+/obj/structure/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/closet/crate,
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/obj/item/ammo_magazine/rifle/l42a/ap{
+ current_rounds = 0
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
"lAl" = (
/turf/open/floor/almayer{
dir = 4;
@@ -49975,6 +50371,20 @@
icon_state = "plate"
},
/area/almayer/engineering/engineering_workshop/hangar)
+"lCn" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/sign/safety/ammunition{
+ pixel_x = 15;
+ pixel_y = 32
+ },
+/obj/structure/sign/safety/hazard{
+ pixel_y = 32
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"lCt" = (
/turf/open/floor/almayer{
dir = 10;
@@ -50027,22 +50437,13 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/starboard_hallway)
-"lDn" = (
+"lDj" = (
/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 1
+ icon_state = "NW-out";
+ pixel_y = 2
},
/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
-"lDD" = (
-/obj/structure/safe/co_office,
-/obj/item/weapon/pole/fancy_cane,
-/obj/item/tool/lighter/zippo/gold{
- pixel_y = 3;
- layer = 3.05
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
+/area/almayer/hull/upper_hull/u_f_p)
"lDJ" = (
/obj/structure/sign/safety/distribution_pipes{
pixel_x = -17
@@ -50052,6 +50453,20 @@
icon_state = "orange"
},
/area/almayer/hallways/starboard_hallway)
+"lDK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/largecrate/supply/weapons/m39{
+ pixel_x = 2
+ },
+/obj/structure/largecrate/supply/weapons/m41a{
+ layer = 3.1;
+ pixel_x = 6;
+ pixel_y = 17
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"lDL" = (
/obj/structure/machinery/light{
dir = 4
@@ -50323,15 +50738,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hull/upper_hull/u_f_s)
-"lIl" = (
-/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
- name = "\improper Armourer's Workshop";
- req_access = null
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"lIp" = (
/obj/structure/bed/chair/comfy/beige{
dir = 1
@@ -50424,19 +50830,6 @@
icon_state = "cargo"
},
/area/almayer/living/offices)
-"lJL" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/shipboard/brig/cells)
"lJO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -50485,6 +50878,20 @@
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer,
/area/almayer/squads/charlie)
+"lLN" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/obj/structure/reagent_dispensers/peppertank{
+ pixel_y = -30
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
+/turf/open/floor/almayer{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/almayer/shipboard/brig/armory)
"lLS" = (
/obj/structure/sign/safety/galley{
pixel_x = 32
@@ -50525,12 +50932,6 @@
icon_state = "plating_striped"
},
/area/almayer/squads/req)
-"lMx" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/engineering/upper_engineering/starboard)
"lMM" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -50680,6 +51081,15 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/brig/cic_hallway)
+"lPG" = (
+/obj/structure/machinery/camera/autoname/almayer{
+ name = "ship-grade camera"
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"lPO" = (
/obj/structure/surface/rack,
/turf/open/floor/almayer{
@@ -50687,14 +51097,6 @@
icon_state = "silver"
},
/area/almayer/command/securestorage)
-"lQi" = (
-/obj/structure/machinery/cm_vending/clothing/commanding_officer{
- pixel_y = 0
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/living/commandbunks)
"lQj" = (
/obj/structure/machinery/door_control{
id = "InnerShutter";
@@ -50836,16 +51238,20 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_p)
-"lUA" = (
-/obj/structure/surface/table/almayer,
-/obj/item/weapon/gun/rifle/l42a{
- pixel_y = 6
- },
-/obj/item/weapon/gun/rifle/l42a,
+"lUv" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
/turf/open/floor/almayer{
- icon_state = "plate"
+ icon_state = "redfull"
},
-/area/almayer/hull/upper_hull/u_m_s)
+/area/almayer/hull/lower_hull/l_f_s)
+"lUw" = (
+/obj/structure/machinery/light,
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_21";
+ pixel_y = 3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"lVl" = (
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
/turf/open/floor/almayer,
@@ -50898,6 +51304,16 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
+"lWD" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out"
+ },
+/obj/structure/sign/safety/bathunisex{
+ pixel_x = 11;
+ pixel_y = -26
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"lXg" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/recharger,
@@ -51093,6 +51509,25 @@
icon_state = "greencorner"
},
/area/almayer/hallways/aft_hallway)
+"mcl" = (
+/obj/structure/sign/safety/ladder{
+ pixel_x = -16
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/turf/open/floor/almayer,
+/area/almayer/hallways/vehiclehangar)
+"mcK" = (
+/obj/structure/closet/secure_closet/commander,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/device/whistle,
+/obj/item/device/megaphone,
+/obj/item/device/radio,
+/obj/item/clothing/shoes/laceup,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"mcL" = (
/obj/structure/machinery/vending/snack,
/obj/structure/sign/safety/maint{
@@ -51268,6 +51703,19 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/charlie_delta_shared)
+"mgR" = (
+/obj/structure/surface/table/almayer,
+/obj/item/prop/magazine/dirty{
+ pixel_y = 5
+ },
+/obj/item/tool/pen{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
+ },
+/area/almayer/living/briefing)
"mha" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out";
@@ -51352,13 +51800,6 @@
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
-"mje" = (
-/obj/structure/machinery/light,
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"mji" = (
/obj/structure/pipes/standard/manifold/fourway/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
@@ -51439,16 +51880,6 @@
allow_construction = 0
},
/area/almayer/shipboard/brig/lobby)
-"mko" = (
-/obj/item/tool/weldpack{
- pixel_y = 15
- },
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/head/welding,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"mkx" = (
/obj/structure/machinery/door_control{
id = "cl_shutters 2";
@@ -51673,12 +52104,6 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall/almayer,
/area/almayer/squads/req)
-"mqb" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 8
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"mqg" = (
/obj/structure/bed/chair{
dir = 4
@@ -51864,17 +52289,6 @@
icon_state = "orange"
},
/area/almayer/squads/bravo)
-"mts" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/l42a,
-/obj/item/weapon/gun/rifle/l42a{
- pixel_y = 6
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"mtD" = (
/obj/structure/machinery/status_display{
pixel_x = 16;
@@ -51919,6 +52333,48 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north1)
+"mus" = (
+/obj/item/bedsheet/blue{
+ layer = 3.2
+ },
+/obj/item/bedsheet/blue{
+ pixel_y = 13
+ },
+/obj/item/toy/plush/therapy/red{
+ desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
+ force = 15;
+ layer = 4.1;
+ name = "Sergeant Huggs";
+ pixel_y = 15;
+ throwforce = 15
+ },
+/obj/item/clothing/head/cmcap{
+ layer = 4.1;
+ pixel_x = -1;
+ pixel_y = 22
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ layer = 3.3;
+ pixel_y = 4
+ },
+/obj/structure/bed{
+ can_buckle = 0
+ },
+/obj/structure/bed{
+ buckling_y = 13;
+ layer = 3.5;
+ pixel_y = 13
+ },
+/turf/open/floor/almayer{
+ icon_state = "blue"
+ },
+/area/almayer/living/port_emb)
"mux" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -51938,6 +52394,18 @@
icon_state = "plate"
},
/area/almayer/squads/alpha)
+"muQ" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/cic)
"mvl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -51951,6 +52419,15 @@
icon_state = "bluecorner"
},
/area/almayer/squads/delta)
+"mvH" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "SE-out";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south2)
"mvI" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 4;
@@ -51964,6 +52441,11 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_lobby)
+"mwz" = (
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"mwA" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -52025,19 +52507,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_f_p)
-"myl" = (
-/obj/structure/machinery/power/apc/almayer/hardened{
- cell_type = /obj/item/cell/hyper;
- dir = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north1)
"myn" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -52124,6 +52593,25 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/south2)
+"mzG" = (
+/obj/structure/bookcase{
+ icon_state = "book-5";
+ name = "law and engineering manuals bookcase";
+ opacity = 0
+ },
+/obj/item/book/manual/marine_law,
+/obj/item/book/manual/detective,
+/obj/item/book/manual/security_space_law,
+/obj/item/book/manual/engineering_guide,
+/obj/item/book/manual/engineering_construction,
+/obj/item/book/manual/orbital_cannon_manual,
+/obj/item/book/manual/ripley_build_and_repair,
+/obj/item/book/manual/engineering_hacking,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"mzO" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
@@ -52151,13 +52639,6 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
-"mAr" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"mAT" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
dir = 8;
@@ -52302,23 +52783,6 @@
icon_state = "emerald"
},
/area/almayer/living/briefing)
-"mDX" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 2
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
- dir = 1;
- id_tag = "CO-Office";
- name = "\improper Commanding Officer's Office";
- req_access = null;
- req_access_txt = "31"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/commandbunks)
"mEb" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -52346,6 +52810,10 @@
},
/turf/open/floor/almayer,
/area/almayer/living/briefing)
+"mES" = (
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"mFq" = (
/obj/structure/machinery/door_control{
dir = 1;
@@ -52499,6 +52967,12 @@
icon_state = "plate"
},
/area/almayer/hallways/hangar)
+"mIA" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/lifeboat_pumps/south2)
"mIB" = (
/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
/obj/structure/sign/safety/medical{
@@ -52509,26 +52983,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
-"mIJ" = (
-/obj/structure/sign/safety/ladder{
- pixel_x = -16
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/turf/open/floor/almayer,
-/area/almayer/hallways/vehiclehangar)
-"mIP" = (
-/obj/structure/pipes/vents/pump,
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/engineering/upper_engineering/port)
"mIW" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer{
@@ -52658,15 +53112,6 @@
icon_state = "mono"
},
/area/almayer/medical/hydroponics)
-"mKy" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/lifeboat)
"mKJ" = (
/obj/structure/machinery/firealarm{
pixel_y = 28
@@ -52722,18 +53167,22 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/port_hallway)
"mLb" = (
-/obj/structure/platform{
- dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/toy/deck{
+ pixel_x = -6;
+ pixel_y = -2
},
/obj/item/toy/deck/uno{
pixel_x = 6;
pixel_y = -1
},
-/obj/item/toy/deck{
- pixel_x = -6;
- pixel_y = -2
+/obj/structure/prop/holidays/string_lights{
+ dir = 8;
+ pixel_x = 29
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/almayer,
/area/almayer/living/briefing)
"mLu" = (
/obj/effect/decal/warning_stripes{
@@ -53021,33 +53470,6 @@
icon_state = "test_floor4"
},
/area/almayer/command/airoom)
-"mRp" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/obj/item/device/radio/intercom{
- freerange = 1;
- name = "General Listening Channel";
- pixel_y = -28
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_s)
-"mRQ" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/obj/structure/machinery/camera/autoname/almayer{
- name = "ship-grade camera"
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"mRS" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -53058,6 +53480,13 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/starboard_hallway)
+"mRU" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
"mRW" = (
/turf/open/floor/almayer/research/containment/corner1,
/area/almayer/medical/containment/cell/cl)
@@ -53123,14 +53552,6 @@
icon_state = "green"
},
/area/almayer/hallways/aft_hallway)
-"mTc" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/computer/emails{
- dir = 4;
- pixel_y = 2
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"mTd" = (
/obj/structure/machinery/smartfridge/chemistry{
pixel_x = -3;
@@ -53272,7 +53693,13 @@
pixel_x = -27
},
/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"mWe" = (
/obj/structure/machinery/camera/autoname/almayer{
@@ -53353,6 +53780,19 @@
dir = 1
},
/area/almayer/medical/containment/cell)
+"mXa" = (
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/l42a{
+ pixel_y = 6
+ },
+/obj/item/weapon/gun/rifle/l42a,
+/obj/item/weapon/gun/rifle/l42a{
+ pixel_y = -6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"mXj" = (
/turf/closed/wall/almayer,
/area/almayer/living/commandbunks)
@@ -53390,6 +53830,17 @@
icon_state = "blue"
},
/area/almayer/hallways/port_hallway)
+"mYX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/m41a{
+ pixel_y = 6
+ },
+/obj/item/weapon/gun/rifle/m41a,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"mYY" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out"
@@ -53477,6 +53928,17 @@
"naB" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/brig/perma)
+"naQ" = (
+/obj/structure/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/engineering/upper_engineering/port)
"naR" = (
/obj/structure/machinery/iv_drip,
/obj/effect/decal/warning_stripes{
@@ -53504,12 +53966,15 @@
icon_state = "test_floor4"
},
/area/almayer/living/gym)
-"nbB" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
+"nbr" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
/turf/open/floor/almayer{
- icon_state = "plate"
+ icon_state = "redfull"
},
-/area/almayer/living/grunt_rnr)
+/area/almayer/command/cic)
"ncp" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
@@ -53616,15 +54081,22 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/hangar)
-"neG" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
+"neF" = (
+/obj/structure/machinery/light{
+ dir = 1
},
+/obj/structure/transmitter{
+ name = "Kitchen Telephone";
+ phone_category = "Almayer";
+ phone_id = "Kitchen";
+ pixel_x = -8;
+ pixel_y = 29
+ },
+/obj/structure/machinery/vending/ingredients,
/turf/open/floor/almayer{
- dir = 6;
- icon_state = "red"
+ icon_state = "plate"
},
-/area/almayer/command/lifeboat)
+/area/almayer/living/grunt_rnr)
"neO" = (
/obj/structure/machinery/power/apc/almayer{
dir = 1
@@ -54038,6 +54510,12 @@
icon_state = "silver"
},
/area/almayer/command/securestorage)
+"nna" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/hull/upper_hull/u_f_s)
"nnc" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/almayer{
@@ -54103,12 +54581,16 @@
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_s)
-"nnX" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
- icon_state = "mono"
+"nnG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
-/area/almayer/lifeboat_pumps/south1)
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"noj" = (
/obj/structure/largecrate,
/obj/structure/prop/server_equipment/laptop{
@@ -54171,6 +54653,35 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/containment)
+"npB" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_s)
+"npK" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/computer/emails{
+ dir = 4;
+ pixel_y = 2
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
+"npS" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/structure/prop/server_equipment/laptop{
+ pixel_x = -2;
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "orangefull"
+ },
+/area/almayer/living/briefing)
"nqx" = (
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
@@ -54283,22 +54794,6 @@
icon_state = "test_floor4"
},
/area/almayer/hull/lower_hull/l_f_s)
-"nsQ" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/structure/mirror{
- pixel_x = 29
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/captain_mess)
"nsY" = (
/turf/closed/wall/almayer,
/area/almayer/living/port_emb)
@@ -54421,6 +54916,17 @@
},
/turf/open/floor/almayer,
/area/almayer/squads/alpha)
+"nuI" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/surface/table/almayer,
+/obj/item/tool/hand_labeler,
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "sterile_green_side"
+ },
+/area/almayer/medical/chemistry)
"nuK" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/condiment/hotsauce/franks{
@@ -54442,24 +54948,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_s)
-"nvG" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/sink{
- pixel_y = 16
- },
-/obj/structure/mirror{
- pixel_y = 21
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/numbertwobunks)
"nvM" = (
/obj/structure/window/framed/almayer/white,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -54507,6 +54995,17 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
+"nww" = (
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ name = "General Listening Channel";
+ pixel_y = 28
+ },
+/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/command/cic)
"nwx" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
@@ -54641,11 +55140,12 @@
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
"nza" = (
-/obj/structure/bed/chair/comfy/charlie,
/obj/structure/pipes/vents/scrubber{
dir = 4
},
-/obj/item/trash/uscm_mre,
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 4
+ },
/turf/open/floor/almayer{
icon_state = "emeraldfull"
},
@@ -54670,6 +55170,18 @@
icon_state = "blue"
},
/area/almayer/hallways/aft_hallway)
+"nzI" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ dir = 10;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"nzO" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/effect/decal/warning_stripes{
@@ -54771,46 +55283,6 @@
icon_state = "orange"
},
/area/almayer/squads/bravo)
-"nCx" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
- pixel_x = -5;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
- desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself.";
- pixel_x = 3;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
- pixel_x = 11;
- pixel_y = 16
- },
-/obj/item/storage/box/drinkingglasses{
- pixel_x = -1;
- pixel_y = 2
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"nCR" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/structure/mirror{
- pixel_x = 29
- },
-/obj/structure/machinery/light{
- unacidable = 1;
- unslashable = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/auxiliary_officer_office)
"nCT" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
@@ -54819,33 +55291,6 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
-"nCU" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/structure/coatrack{
- pixel_y = 1;
- pixel_x = -5
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"nDd" = (
-/obj/structure/sign/safety/ammunition{
- pixel_x = 15;
- pixel_y = 32
- },
-/obj/structure/sign/safety/hazard{
- pixel_y = 32
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/hull/lower_hull/l_f_s)
"nDh" = (
/obj/structure/transmitter/rotary{
name = "CL Office Telephone";
@@ -54885,6 +55330,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/req)
+"nDV" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/command/cichallway)
"nEo" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/donut_box{
@@ -55051,12 +55501,6 @@
icon_state = "plate"
},
/area/almayer/shipboard/port_point_defense)
-"nGY" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/lifeboat_pumps/north2)
"nHg" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -55151,12 +55595,12 @@
/turf/open/floor/almayer,
/area/almayer/living/basketball)
"nIW" = (
-/obj/structure/bed/chair/comfy/bravo{
- dir = 1
- },
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
},
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 1
+ },
/turf/open/floor/almayer{
icon_state = "orangefull"
},
@@ -55202,6 +55646,15 @@
icon_state = "red"
},
/area/almayer/command/lifeboat)
+"nKs" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+ pixel_y = 0;
+ req_access = list(1)
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/living/commandbunks)
"nLa" = (
/obj/structure/bed/chair{
dir = 4
@@ -55324,6 +55777,16 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
+"nMM" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 2
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
"nMV" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
pixel_y = 25
@@ -55501,18 +55964,6 @@
icon_state = "plate"
},
/area/almayer/squads/req)
-"nPY" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- dir = 10;
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"nQg" = (
/obj/structure/sink{
pixel_y = 24
@@ -55532,6 +55983,13 @@
/obj/structure/machinery/light,
/turf/open/floor/almayer,
/area/almayer/hallways/aft_hallway)
+"nQH" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"nRq" = (
/obj/effect/decal/cleanable/blood/oil/streak,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -55547,6 +56005,17 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"nRQ" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+ name = "\improper Commanding Officer's Quarters";
+ req_access = null;
+ req_access_txt = "31"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/commandbunks)
"nRR" = (
/turf/open/floor/almayer{
dir = 1;
@@ -55557,6 +56026,13 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/engineering/upper_engineering)
+"nSj" = (
+/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend,
+/turf/open/floor/almayer{
+ dir = 10;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"nSG" = (
/obj/structure/machinery/door_control{
id = "tcomms";
@@ -55613,10 +56089,6 @@
},
/turf/open/floor/almayer,
/area/almayer/command/computerlab)
-"nTA" = (
-/obj/structure/bed/chair/comfy/blue,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"nTH" = (
/obj/structure/sign/safety/storage{
pixel_x = 8;
@@ -56041,6 +56513,23 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/bravo)
+"odC" = (
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/obj/item/prop/magazine/boots/n160{
+ layer = 2.8;
+ pixel_x = 4;
+ pixel_y = -8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/commandbunks)
"odD" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 8;
@@ -56160,6 +56649,16 @@
icon_state = "cargo"
},
/area/almayer/squads/charlie)
+"ohl" = (
+/obj/structure/window/framed/almayer,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ dir = 9;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"ohA" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -56207,18 +56706,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/north2)
-"ohS" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 1
- },
-/obj/structure/machinery/door/airlock/almayer/generic{
- name = "\improper Bathroom"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/captain_mess)
"oih" = (
/obj/structure/bed{
icon_state = "abed"
@@ -56377,9 +56864,6 @@
},
/area/almayer/engineering/engine_core)
"okB" = (
-/obj/structure/bed/chair/comfy/alpha{
- dir = 1
- },
/obj/structure/pipes/vents/scrubber{
dir = 4
},
@@ -56409,6 +56893,21 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/execution)
+"olk" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 2
+ },
+/obj/structure/machinery/door/airlock/almayer/generic{
+ name = "\improper Bathroom"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/engineering/upper_engineering/port)
"olv" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/hand_labeler{
@@ -56478,13 +56977,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/wood/ship,
/area/almayer/shipboard/brig/cells)
-"omu" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"omy" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -56558,17 +57050,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
-"ooo" = (
-/obj/structure/reagent_dispensers/water_cooler/stacks{
- density = 0;
- pixel_y = 17
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- pixel_x = -1
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_s)
"oos" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/grunt_rnr)
@@ -56606,6 +57087,16 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/perma)
+"opj" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/spawner/random/powercell,
+/obj/effect/spawner/random/tool,
+/obj/item/packageWrap,
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"opC" = (
/obj/structure/machinery/door/airlock/almayer/command/reinforced{
name = "\improper Combat Information Center"
@@ -56617,23 +57108,6 @@
"opD" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/gym)
-"opI" = (
-/obj/structure/closet/secure_closet,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
-/obj/item/storage/box/tapes,
-/obj/item/clothing/head/fedora,
-/obj/item/clothing/suit/storage/marine/light/reporter,
-/obj/item/clothing/head/helmet/marine/reporter,
-/obj/item/clothing/head/cmcap/reporter,
-/obj/item/device/flashlight,
-/obj/item/device/toner,
-/obj/item/device/toner,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"opJ" = (
/obj/docking_port/stationary/emergency_response/external/port4,
/turf/open/space/basic,
@@ -56696,6 +57170,14 @@
},
/turf/open/floor/plating,
/area/almayer/hull/lower_hull/l_f_p)
+"oqP" = (
+/obj/structure/bed/chair/comfy/delta{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"oqS" = (
/obj/structure/toilet{
dir = 1
@@ -56710,16 +57192,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/port_emb)
-"oqY" = (
-/obj/structure/machinery/conveyor{
- id = "req_belt"
- },
-/obj/structure/plasticflaps,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 1
- },
-/turf/open/floor/almayer,
-/area/almayer/squads/req)
"oqZ" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/microwave{
@@ -56870,6 +57342,18 @@
"otu" = (
/turf/closed/wall/almayer/research/containment/wall/connect_w,
/area/almayer/medical/containment/cell)
+"otK" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
+ access_modified = 1;
+ dir = 1;
+ name = "\improper Flight Crew Quarters";
+ req_one_access_txt = "19;22"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/pilotbunks)
"otX" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -56928,6 +57412,23 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
+"ouT" = (
+/obj/item/trash/plate{
+ pixel_x = 9;
+ pixel_y = 11
+ },
+/obj/item/reagent_container/food/snacks/carpmeat{
+ layer = 3.3;
+ pixel_x = 8;
+ pixel_y = 11
+ },
+/obj/item/reagent_container/food/snacks/carpmeat{
+ layer = 3.3;
+ pixel_x = 8;
+ pixel_y = 11
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"ouV" = (
/obj/structure/sign/safety/cryo{
pixel_x = 1;
@@ -57069,6 +57570,23 @@
icon_state = "orangecorner"
},
/area/almayer/hull/upper_hull/u_a_s)
+"oys" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+ dir = 1;
+ id_tag = "CO-Office";
+ name = "\improper Commanding Officer's Office";
+ req_access = null;
+ req_access_txt = "31"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/commandbunks)
"oyw" = (
/obj/structure/platform_decoration{
dir = 8
@@ -57223,6 +57741,24 @@
icon_state = "silver"
},
/area/almayer/command/cichallway)
+"oBW" = (
+/obj/structure/surface/table/woodentable/fancy,
+/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 = -3;
+ pixel_y = 9
+ },
+/obj/item/prop/helmetgarb/rosary{
+ pixel_x = -4;
+ pixel_y = 5
+ },
+/obj/item/device/flashlight/lamp{
+ pixel_x = 3;
+ pixel_y = 1
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"oCf" = (
/obj/structure/machinery/light{
unacidable = 1;
@@ -57315,6 +57851,12 @@
icon_state = "mono"
},
/area/almayer/medical/medical_science)
+"oDO" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south2)
"oDR" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
@@ -57536,15 +58078,18 @@
icon_state = "test_floor4"
},
/area/almayer/medical/medical_science)
-"oIt" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
"oIB" = (
/turf/closed/wall/almayer,
/area/almayer/command/combat_correspondent)
+"oIY" = (
+/obj/structure/machinery/cryopod/right{
+ layer = 3.1;
+ pixel_y = 13
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/airoom)
"oJp" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 1
@@ -57683,12 +58228,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/hydroponics)
-"oMd" = (
-/obj/structure/closet/secure_closet/freezer/meat,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/grunt_rnr)
"oMe" = (
/obj/structure/machinery/light{
dir = 8
@@ -57717,6 +58256,13 @@
icon_state = "rasputin3"
},
/area/almayer/powered/agent)
+"oMC" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"oMH" = (
/obj/structure/bed/chair{
dir = 4
@@ -57739,14 +58285,6 @@
icon_state = "mono"
},
/area/almayer/engineering/ce_room)
-"oNf" = (
-/obj/item/stack/folding_barricade/three,
-/obj/item/stack/folding_barricade/three,
-/obj/structure/surface/rack,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/hull/lower_hull/l_f_s)
"oNj" = (
/obj/structure/sign/prop1{
pixel_x = -32;
@@ -58060,40 +58598,6 @@
icon_state = "cargo"
},
/area/almayer/squads/alpha)
-"oTM" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/item/clothing/mask/cigarette/pipe{
- pixel_y = -7;
- layer = 2.8
- },
-/obj/item/reagent_container/spray/cleaner{
- pixel_x = -4;
- pixel_y = 7;
- layer = 3.04
- },
-/obj/structure/machinery/door_control/brbutton{
- pixel_y = 26;
- pixel_x = -12;
- id = "Brig Lockdown Shutters";
- name = "Brig Lockdown"
- },
-/obj/structure/machinery/door_control/brbutton{
- pixel_y = 26;
- id = "ARES StairsLock";
- name = "ARES Exterior Lockdown Override";
- pixel_x = -2
- },
-/obj/structure/machinery/door_control/brbutton{
- pixel_y = 26;
- pixel_x = 8;
- name = "ARES Emergency Lockdown Override";
- id = "ARES Emergency"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"oUG" = (
/obj/structure/machinery/light{
dir = 8
@@ -58300,6 +58804,15 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/main_office)
+"pbl" = (
+/obj/structure/bed,
+/obj/item/toy/plush/farwa{
+ pixel_x = 5
+ },
+/obj/item/clothing/under/redpyjamas,
+/obj/item/bedsheet/orange,
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
"pbp" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
@@ -58433,12 +58946,6 @@
icon_state = "test_floor4"
},
/area/almayer/hull/lower_hull/l_f_p)
-"pdt" = (
-/obj/structure/closet/secure_closet/freezer/fridge/groceries,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/grunt_rnr)
"pdG" = (
/obj/structure/machinery/door/airlock/almayer/security{
dir = 2;
@@ -58494,6 +59001,7 @@
/obj/item/facepaint/black{
pixel_x = -10
},
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -58516,6 +59024,18 @@
allow_construction = 0
},
/area/almayer/stair_clone)
+"pfA" = (
+/obj/item/tool/soap,
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/engineering/upper_engineering/port)
"pfH" = (
/obj/structure/platform_decoration,
/turf/open/floor/almayer{
@@ -58544,15 +59064,6 @@
icon_state = "orange"
},
/area/almayer/hull/lower_hull/l_m_s)
-"pgw" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/engineering/upper_engineering/port)
"pgD" = (
/turf/closed/wall/almayer,
/area/almayer/lifeboat_pumps/south1)
@@ -58588,15 +59099,6 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
-"phj" = (
-/obj/structure/machinery/photocopier,
-/obj/structure/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"piO" = (
/obj/structure/surface/rack,
/obj/item/tool/weldingtool,
@@ -58672,16 +59174,6 @@
},
/turf/open/floor/almayer,
/area/almayer/engineering/engineering_workshop/hangar)
-"pjR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"pky" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor/almayer{
@@ -58768,16 +59260,6 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
-"pmI" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 2
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
"pmV" = (
/obj/structure/prop/server_equipment/yutani_server/broken{
density = 0;
@@ -58802,23 +59284,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
-"pnL" = (
-/obj/structure/machinery/constructable_frame{
- icon_state = "box_2"
- },
-/obj/item/weapon/baseballbat/metal{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "SW-out";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- dir = 6;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering/starboard)
"pop" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -59204,6 +59669,20 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/south2)
+"pxL" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/structure/coatrack{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 5
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"pyc" = (
/obj/structure/bed/stool,
/turf/open/floor/almayer{
@@ -59683,15 +60162,16 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
-"pIZ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 2
+"pJe" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/prop/tableflag/uscm{
+ pixel_x = -5
},
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
+/obj/item/prop/tableflag/uscm2{
+ pixel_x = 5
},
-/area/almayer/lifeboat_pumps/north1)
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"pJi" = (
/obj/structure/closet/firecloset,
/turf/open/floor/almayer{
@@ -59699,6 +60179,18 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/general_equipment)
+"pJn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/largecrate/random/secure{
+ pixel_x = -5
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"pJD" = (
/obj/structure/pipes/vents/scrubber{
dir = 1
@@ -59745,6 +60237,21 @@
icon_state = "green"
},
/area/almayer/hallways/port_hallway)
+"pJK" = (
+/obj/structure/bookcase{
+ icon_state = "book-5";
+ name = "medical manuals bookcase";
+ opacity = 0
+ },
+/obj/item/book/manual/surgery,
+/obj/item/book/manual/research_and_development,
+/obj/item/book/manual/medical_diagnostics_manual,
+/obj/item/book/manual/medical_cloning,
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"pJR" = (
/obj/effect/step_trigger/teleporter_vector{
name = "Almayer_AresUp";
@@ -59816,15 +60323,6 @@
icon_state = "plate"
},
/area/almayer/living/captain_mess)
-"pMk" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north2)
"pMp" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
@@ -59871,6 +60369,14 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_p)
+"pNK" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/auxiliary_officer_office)
"pNM" = (
/obj/structure/platform{
dir = 4
@@ -59977,6 +60483,16 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
+"pPF" = (
+/obj/structure/machinery/power/apc/almayer/hardened,
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south2)
"pPM" = (
/obj/structure/surface/rack,
/turf/open/floor/almayer{
@@ -59991,6 +60507,28 @@
icon_state = "red"
},
/area/almayer/shipboard/port_missiles)
+"pPV" = (
+/obj/structure/pipes/vents/pump,
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ pixel_y = 24
+ },
+/obj/structure/machinery/door_control{
+ id = "Alpha_2";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = 23;
+ specialfunctions = 4
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/port_emb)
"pQq" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out"
@@ -60117,6 +60655,12 @@
icon_state = "test_floor5"
},
/area/almayer/medical/hydroponics)
+"pSH" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"pSL" = (
/obj/structure/machinery/alarm/almayer{
dir = 1
@@ -60172,6 +60716,16 @@
icon_state = "mono"
},
/area/almayer/command/computerlab)
+"pUe" = (
+/obj/structure/machinery/power/apc/almayer/hardened,
+/obj/effect/decal/warning_stripes{
+ icon_state = "SE-out";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south1)
"pUf" = (
/obj/structure/bed/chair{
dir = 4
@@ -60195,6 +60749,15 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_m_p)
+"pUl" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hallways/vehiclehangar)
"pUp" = (
/obj/item/device/radio/intercom{
freerange = 1;
@@ -60250,12 +60813,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
-"pVx" = (
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/squads/req)
"pVA" = (
/obj/item/trash/cigbutt/ucigbutt{
pixel_x = 2;
@@ -60452,6 +61009,12 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/containment)
+"pYp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"pYu" = (
/obj/item/tool/warning_cone{
pixel_x = -12;
@@ -60523,6 +61086,23 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
+"qan" = (
+/obj/item/device/radio/listening_bug/radio_linked/mp{
+ pixel_y = 8
+ },
+/obj/item/device/radio/listening_bug/radio_linked/mp,
+/obj/structure/closet/secure_closet/cmdcabinet{
+ pixel_y = 24;
+ desc = "A bulletproof cabinet containing communications equipment.";
+ name = "communications cabinet";
+ req_access = null;
+ req_one_access_txt = "3"
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/almayer/shipboard/brig/main_office)
"qau" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -60579,6 +61159,15 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
+"qbh" = (
+/obj/structure/pipes/vents/pump{
+ dir = 1
+ },
+/obj/structure/machinery/light/small,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"qbt" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor/almayer{
@@ -60835,12 +61424,6 @@
icon_state = "silvercorner"
},
/area/almayer/command/cichallway)
-"qfD" = (
-/obj/structure/bed/chair/office/dark{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"qfR" = (
/obj/structure/machinery/light{
dir = 1
@@ -60859,10 +61442,13 @@
},
/area/almayer/living/starboard_garden)
"qgw" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/almayer,
/area/almayer/living/briefing)
"qgG" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
@@ -60905,16 +61491,6 @@
},
/turf/open/floor/almayer,
/area/almayer/squads/delta)
-"qgU" = (
-/obj/structure/machinery/power/apc/almayer/hardened,
-/obj/effect/decal/warning_stripes{
- icon_state = "SE-out";
- pixel_x = 1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south1)
"qhb" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer{
@@ -61001,7 +61577,9 @@
pixel_x = 27
},
/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"qit" = (
/obj/structure/surface/table/reinforced/almayer_B,
@@ -61069,19 +61647,15 @@
/obj/effect/landmark/late_join/charlie,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/charlie)
-"qkm" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_21"
- },
-/obj/structure/sign/poster/io{
- pixel_y = 32;
- name = "propaganda poster"
+"qkj" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
},
-/obj/structure/sign/safety/escapepod{
- pixel_x = -17
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
+/area/almayer/command/lifeboat)
"qkn" = (
/obj/structure/sign/safety/maint{
pixel_x = -17
@@ -61116,16 +61690,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/hallways/starboard_umbilical)
-"qlp" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/prop/tableflag/uscm{
- pixel_x = -5
- },
-/obj/item/prop/tableflag/uscm2{
- pixel_x = 5
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"qlz" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -61135,14 +61699,6 @@
},
/turf/open/floor/plating,
/area/almayer/shipboard/sea_office)
-"qlI" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"qmk" = (
/obj/structure/surface/table/almayer,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -61157,6 +61713,21 @@
icon_state = "bluecorner"
},
/area/almayer/squads/delta)
+"qmr" = (
+/obj/structure/surface/table/almayer,
+/obj/item/tool/screwdriver,
+/obj/item/prop/helmetgarb/gunoil{
+ pixel_x = -7;
+ pixel_y = 12
+ },
+/obj/item/weapon/gun/rifle/l42a{
+ pixel_x = 17;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"qmt" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out";
@@ -61205,6 +61776,18 @@
icon_state = "sterile_green_corner"
},
/area/almayer/medical/medical_science)
+"qmB" = (
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8;
+ pixel_x = 29
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"qmC" = (
/obj/structure/machinery/door/poddoor/almayer/open{
dir = 4;
@@ -61267,17 +61850,6 @@
icon_state = "plate"
},
/area/almayer/shipboard/brig/perma)
-"qmZ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/transmitter/rotary{
- name = "Commanding Officer's Office";
- phone_category = "Offices";
- phone_id = "Commanding Officer's Office";
- pixel_y = 8;
- pixel_x = 16
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"qnd" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out"
@@ -61404,6 +61976,16 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/chemistry)
+"qpU" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22";
+ pixel_y = 12
+ },
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/lifeboat)
"qqn" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal3";
@@ -61411,15 +61993,6 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/basketball)
-"qqr" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/engineering/upper_engineering)
"qqu" = (
/turf/open/floor/almayer{
dir = 1;
@@ -61485,6 +62058,15 @@
icon_state = "silver"
},
/area/almayer/command/computerlab)
+"qsa" = (
+/obj/structure/bed/chair/comfy/bravo{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"qsd" = (
/obj/structure/largecrate/random,
/turf/open/floor/almayer{
@@ -61528,6 +62110,12 @@
icon_state = "plate"
},
/area/almayer/living/gym)
+"qtR" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/lifeboat)
"qtS" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/almayer,
@@ -61553,20 +62141,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/cryo_tubes)
-"quy" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/sign/safety/maint{
- pixel_x = 8;
- pixel_y = -32
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "SW-out";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/command/lifeboat)
"quI" = (
/obj/structure/machinery/door_control{
id = "laddersouthwest";
@@ -61812,6 +62386,35 @@
icon_state = "plating"
},
/area/almayer/hallways/vehiclehangar)
+"qyH" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
+"qyJ" = (
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/command/cic)
+"qyM" = (
+/obj/structure/surface/table/almayer,
+/obj/item/clothing/mask/cigarette/pipe{
+ pixel_x = 8
+ },
+/obj/structure/transmitter/rotary{
+ name = "Reporter Telephone";
+ phone_category = "Almayer";
+ phone_id = "Reporter";
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"qyW" = (
/obj/structure/bed/chair{
dir = 4
@@ -61897,12 +62500,15 @@
},
/turf/open/floor/almayer,
/area/almayer/living/briefing)
-"qCi" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
+"qCg" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ pixel_y = 24
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
+/area/almayer/engineering/upper_engineering/port)
"qCo" = (
/obj/structure/pipes/vents/pump{
dir = 1
@@ -62083,12 +62689,6 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/operating_room_two)
-"qGU" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/lifeboat_pumps/south2)
"qHb" = (
/obj/structure/bed/chair{
dir = 8
@@ -62172,15 +62772,6 @@
icon_state = "mono"
},
/area/almayer/medical/medical_science)
-"qJf" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/engineering/upper_engineering)
"qJj" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal3";
@@ -62236,15 +62827,6 @@
icon_state = "kitchen"
},
/area/almayer/living/grunt_rnr)
-"qJU" = (
-/obj/structure/bed,
-/obj/item/toy/plush/farwa{
- pixel_x = 5
- },
-/obj/item/clothing/under/redpyjamas,
-/obj/item/bedsheet/orange,
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
"qJY" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/drinks/bottle/orangejuice{
@@ -62290,16 +62872,6 @@
icon_state = "plating"
},
/area/almayer/engineering/upper_engineering)
-"qKt" = (
-/obj/structure/closet/emcloset,
-/obj/structure/machinery/camera/autoname/almayer{
- dir = 4;
- name = "ship-grade camera"
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/hull/upper_hull/u_f_s)
"qKz" = (
/obj/structure/machinery/light/small,
/turf/open/floor/almayer{
@@ -62328,16 +62900,6 @@
icon_state = "greencorner"
},
/area/almayer/hallways/port_hallway)
-"qKY" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 9;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering/port)
"qLi" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out";
@@ -62580,15 +63142,6 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/lower_medical_lobby)
-"qPX" = (
-/obj/structure/machinery/light,
-/obj/effect/decal/warning_stripes{
- icon_state = "SE-out"
- },
-/turf/open/floor/almayer{
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"qQc" = (
/obj/structure/closet/secure_closet/personal/patient{
name = "morgue closet"
@@ -62606,6 +63159,16 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/south1)
+"qQL" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 5;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering/port)
"qQM" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -62667,6 +63230,19 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/general_equipment)
+"qRL" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{
+ access_modified = 1;
+ name = "\improper Flight Crew Quarters";
+ req_one_access_txt = "19;22"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/pilotbunks)
"qRT" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out";
@@ -62845,6 +63421,12 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
+"qWy" = (
+/obj/structure/bed/chair/comfy/delta,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"qWI" = (
/obj/structure/machinery/status_display{
pixel_y = -30
@@ -63094,15 +63676,6 @@
icon_state = "silvercorner"
},
/area/almayer/command/computerlab)
-"rbE" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
- req_access = list(1);
- pixel_y = 0
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/living/commandbunks)
"rbF" = (
/obj/effect/landmark/late_join,
/obj/effect/landmark/ert_spawns/distress_cryo,
@@ -63175,6 +63748,37 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering)
+"rcW" = (
+/obj/item/storage/toolbox/mechanical{
+ pixel_y = 13
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
+"rdb" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin/uscm{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 2
+ },
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 9
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8;
+ pixel_x = 29
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"rde" = (
/obj/structure/sign/prop1,
/turf/closed/wall/almayer,
@@ -63290,6 +63894,18 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_m_s)
+"rfv" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/faxmachine/uscm/command/capt{
+ name = "Commanding Officer's Fax Machine";
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"rfI" = (
/obj/structure/sign/safety/airlock{
pixel_y = -32
@@ -63337,14 +63953,6 @@
"rgJ" = (
/obj/structure/machinery/light,
/obj/structure/machinery/disposal,
-/obj/item/bananapeel{
- desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil";
- icon = 'icons/obj/items/weapons/guns/attachments.dmi';
- icon_state = "iffbarrel";
- name = "Broken B8 Smart-Scope";
- pixel_x = -1;
- pixel_y = 11
- },
/obj/structure/disposalpipe/trunk{
dir = 1
},
@@ -63376,6 +63984,17 @@
icon_state = "emeraldcorner"
},
/area/almayer/living/briefing)
+"rhD" = (
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"rhO" = (
/obj/structure/machinery/vending/cola/research{
pixel_x = 4
@@ -63670,17 +64289,6 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
-"rmE" = (
-/obj/structure/machinery/light/small{
- dir = 4
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/engineering/upper_engineering/port)
"rmN" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
@@ -63851,6 +64459,17 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
+"rqH" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/transmitter/rotary{
+ name = "Commanding Officer's Office";
+ phone_category = "Offices";
+ phone_id = "Commanding Officer's Office";
+ pixel_x = 16;
+ pixel_y = 8
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"rra" = (
/obj/structure/machinery/door/poddoor/almayer/locked{
dir = 8;
@@ -63958,6 +64577,16 @@
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/command/computerlab)
+"rsW" = (
+/obj/structure/pipes/vents/pump,
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/engineering/upper_engineering/port)
"rsY" = (
/obj/structure/machinery/power/apc/almayer{
dir = 1
@@ -64037,22 +64666,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/grunt_rnr)
-"rur" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S";
- pixel_y = -1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/port_emb)
"rux" = (
/obj/structure/surface/table/almayer,
/obj/item/paper_bin/uscm,
@@ -64103,6 +64716,12 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_s)
+"rwT" = (
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/engineering/upper_engineering)
"rwY" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -64163,12 +64782,11 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/north1)
-"ryR" = (
-/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
+"rzf" = (
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/airoom)
"rzj" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -64210,6 +64828,13 @@
icon_state = "bluecorner"
},
/area/almayer/living/briefing)
+"rAv" = (
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/shipboard/brig/cells)
"rAx" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -64515,6 +65140,14 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
+"rEJ" = (
+/obj/structure/machinery/light,
+/obj/structure/flora/pottedplant{
+ pixel_x = -1;
+ pixel_y = 3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"rEL" = (
/obj/structure/machinery/cm_vending/gear/intelligence_officer,
/turf/open/floor/almayer{
@@ -64577,6 +65210,29 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
+"rFV" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/paper_bin/uscm{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = -10;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = -10;
+ pixel_y = -2
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"rFY" = (
/turf/open/floor/almayer{
dir = 5;
@@ -64752,6 +65408,11 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_s)
+"rJg" = (
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"rJh" = (
/obj/item/storage/backpack/marine/satchel{
desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
@@ -64876,28 +65537,6 @@
dir = 8
},
/area/almayer/medical/containment/cell/cl)
-"rNb" = (
-/obj/structure/pipes/vents/pump,
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/structure/sink{
- pixel_y = 24
- },
-/obj/structure/machinery/door_control{
- id = "Alpha_2";
- name = "Door Lock";
- normaldoorcontrol = 1;
- pixel_x = 23;
- specialfunctions = 4
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/port_emb)
"rNF" = (
/obj/structure/machinery/light{
unacidable = 1;
@@ -64949,6 +65588,17 @@
icon_state = "plate"
},
/area/almayer/living/gym)
+"rOZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/guncabinet,
+/obj/item/weapon/gun/rifle/l42a{
+ pixel_y = 6
+ },
+/obj/item/weapon/gun/rifle/l42a,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"rPh" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -65193,6 +65843,27 @@
icon_state = "silver"
},
/area/almayer/command/computerlab)
+"rUB" = (
+/obj/structure/pipes/vents/pump,
+/obj/item/tool/soap,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/obj/structure/sink{
+ pixel_y = 24
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/shipboard/brig/cells)
"rUU" = (
/obj/structure/machinery/door/airlock/almayer/maint{
req_access = null;
@@ -65228,6 +65899,14 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/brig/cic_hallway)
+"rWF" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/lifeboat)
"rWL" = (
/obj/structure/barricade/metal,
/turf/open/floor/almayer{
@@ -65334,6 +66013,14 @@
icon_state = "plate"
},
/area/almayer/living/offices/flight)
+"rYZ" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/vehiclehangar)
"rZz" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
@@ -65665,6 +66352,17 @@
icon_state = "plating"
},
/area/almayer/hull/lower_hull/l_f_s)
+"sgE" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/reagent_dispensers/water_cooler{
+ density = 0;
+ pixel_x = 12;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"sgM" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/almayer{
@@ -65804,6 +66502,18 @@
icon_state = "test_floor4"
},
/area/almayer/command/lifeboat)
+"skg" = (
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ dir = 10;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering/starboard)
"skl" = (
/obj/structure/bed/chair/office/dark{
dir = 8
@@ -65955,6 +66665,25 @@
icon_state = "blue"
},
/area/almayer/squads/delta)
+"soa" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_x = 1;
+ pixel_y = 1
+ },
+/obj/structure/machinery/door/airlock/almayer/generic{
+ dir = 1;
+ name = "Bathroom"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/shipboard/brig/cells)
"soq" = (
/obj/structure/machinery/computer/working_joe{
dir = 4;
@@ -66157,6 +66886,12 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/repair_bay)
+"ssn" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"ssD" = (
/obj/structure/machinery/light/small{
dir = 4
@@ -66185,15 +66920,6 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/starboard)
-"ssW" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"ssX" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 6
@@ -66228,12 +66954,6 @@
allow_construction = 0
},
/area/almayer/stair_clone/upper)
-"stu" = (
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north1)
"stY" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -66292,18 +67012,16 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
-"svC" = (
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/smg/m39{
- pixel_y = 6
- },
-/obj/item/weapon/gun/smg/m39{
- pixel_y = -6
+"svp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
},
-/turf/open/floor/almayer{
- icon_state = "plate"
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
},
-/area/almayer/hull/upper_hull/u_m_s)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
"swn" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -66404,28 +67122,6 @@
icon_state = "plate"
},
/area/almayer/living/bridgebunks)
-"sxT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/m41a{
- pixel_y = 6
- },
-/obj/item/weapon/gun/rifle/m41a,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
-"sxW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "silver"
- },
-/area/almayer/command/cichallway)
"syH" = (
/obj/structure/machinery/firealarm{
pixel_y = -28
@@ -66543,6 +67239,18 @@
icon_state = "orange"
},
/area/almayer/engineering/ce_room)
+"sBs" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper,
+/obj/item/tool/pen{
+ pixel_x = -5;
+ pixel_y = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/living/briefing)
"sBH" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
@@ -66814,6 +67522,17 @@
/obj/structure/mirror,
/turf/closed/wall/almayer,
/area/almayer/living/gym)
+"sGX" = (
+/obj/structure/machinery/firealarm{
+ pixel_y = -28
+ },
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"sGZ" = (
/obj/structure/closet/firecloset,
/turf/open/floor/almayer{
@@ -67008,25 +67727,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/starboard_hallway)
-"sLZ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/device/flashlight/lamp/green{
- pixel_y = 20;
- pixel_x = -7
- },
-/obj/item/ashtray/bronze{
- pixel_y = 19;
- pixel_x = 4
- },
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/landmark/map_item{
- pixel_y = 3;
- pixel_x = -1
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"sMs" = (
/obj/structure/machinery/door/airlock/almayer/maint/reinforced{
dir = 1
@@ -67132,15 +67832,6 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
-"sOZ" = (
-/obj/structure/sign/safety/ammunition{
- pixel_y = 32
- },
-/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/medical/upper_medical)
"sPc" = (
/obj/structure/machinery/light{
dir = 1
@@ -67445,27 +68136,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/brig/cryo)
-"sWs" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/hull/upper_hull/u_f_p)
-"sWC" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_y = 2
- },
-/obj/structure/machinery/door/airlock/almayer/generic{
- name = "\improper Bathroom"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/engineering/upper_engineering/port)
"sWW" = (
/obj/structure/machinery/flasher{
alpha = 1;
@@ -67586,14 +68256,6 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south2)
-"sYB" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"sYC" = (
/obj/structure/machinery/door/airlock/almayer/maint,
/obj/structure/machinery/door/poddoor/almayer/open{
@@ -67723,12 +68385,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/aft_hallway)
-"tan" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"tat" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -67807,14 +68463,6 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/perma)
-"tcZ" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/engineering/upper_engineering/port)
"tda" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 2
@@ -67925,15 +68573,6 @@
/obj/effect/landmark/late_join,
/turf/open/floor/almayer,
/area/almayer/living/cryo_cells)
-"teE" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/toilet{
- dir = 4
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
"teH" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -68013,6 +68652,11 @@
icon_state = "plating"
},
/area/almayer/shipboard/brig/armory)
+"tgE" = (
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/living/briefing)
"tgK" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -68060,6 +68704,15 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/alpha_bravo_shared)
+"thE" = (
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"thL" = (
/turf/open/floor/wood/ship,
/area/almayer/shipboard/brig/cells)
@@ -68074,18 +68727,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
-"thR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light/small{
- dir = 1
- },
-/obj/structure/largecrate/random/secure{
- pixel_x = -5
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"thT" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -68146,6 +68787,23 @@
icon_state = "green"
},
/area/almayer/hallways/starboard_hallway)
+"tiw" = (
+/obj/structure/machinery/constructable_frame{
+ icon_state = "box_2"
+ },
+/obj/item/weapon/baseballbat/metal{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out";
+ pixel_x = -1
+ },
+/turf/open/floor/almayer{
+ dir = 6;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering/starboard)
"tiE" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -68462,6 +69120,12 @@
icon_state = "test_floor4"
},
/area/almayer/hull/lower_hull/l_m_s)
+"tpt" = (
+/obj/structure/machinery/sentry_holder/almayer,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north2)
"tpD" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -68488,21 +69152,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_p)
-"tqd" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/screwdriver,
-/obj/item/prop/helmetgarb/gunoil{
- pixel_x = -7;
- pixel_y = 12
- },
-/obj/item/weapon/gun/rifle/l42a{
- pixel_x = 17;
- pixel_y = 6
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"tqe" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -68554,6 +69203,32 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_p)
+"tqB" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
+"tqI" = (
+/obj/structure/machinery/door/window/westright,
+/obj/structure/machinery/shower{
+ dir = 8;
+ layer = 3.10;
+ plane = -4
+ },
+/obj/item/tool/soap{
+ pixel_x = 2;
+ pixel_y = 7
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/commandbunks)
"tqV" = (
/obj/structure/extinguisher_cabinet{
pixel_y = 26
@@ -68838,25 +69513,6 @@
icon_state = "outerhull_dir"
},
/area/space)
-"twI" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
- density = 0;
- pixel_y = 16
- },
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/machinery/door_control{
- id = "bot_uniforms";
- name = "Uniform Vendor Lockdown";
- pixel_x = -24;
- pixel_y = 18;
- req_access_txt = "31"
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/cic)
"twT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -69008,6 +69664,12 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/lower_medical_lobby)
+"tAh" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/engineering/upper_engineering/port)
"tAi" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -69031,6 +69693,12 @@
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering/port)
+"tAJ" = (
+/obj/structure/closet/secure_closet/fridge/dry,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"tAL" = (
/obj/structure/machinery/cryopod,
/turf/open/floor/almayer{
@@ -69075,13 +69743,6 @@
/obj/item/tool/crowbar,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/south1)
-"tBu" = (
-/obj/effect/decal/cleanable/blood/oil/streak,
-/obj/structure/machinery/sentry_holder/almayer,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south1)
"tBz" = (
/obj/structure/machinery/power/apc/almayer{
dir = 1
@@ -69267,15 +69928,6 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/south2)
-"tGj" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north1)
"tGq" = (
/obj/effect/projector{
name = "Almayer_Up4";
@@ -69352,12 +70004,18 @@
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
/area/almayer/shipboard/brig/cells)
-"tId" = (
-/obj/structure/machinery/recharge_station,
-/turf/open/floor/almayer{
- icon_state = "cargo"
+"tHU" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
},
-/area/almayer/command/airoom)
+/obj/structure/machinery/power/apc/almayer{
+ dir = 8
+ },
+/obj/item/storage/briefcase{
+ pixel_y = 15
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"tIp" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "\improper Dorms"
@@ -69423,6 +70081,17 @@
icon_state = "plate"
},
/area/almayer/living/bridgebunks)
+"tJo" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_p)
"tJp" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/crowbar/red,
@@ -69454,15 +70123,6 @@
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
-"tJN" = (
-/obj/structure/machinery/cryopod/right{
- layer = 3.1;
- pixel_y = 13
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/airoom)
"tJR" = (
/obj/structure/machinery/vending/cigarette,
/obj/structure/sign/safety/medical{
@@ -69536,6 +70196,17 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_a_s)
+"tMc" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"tMf" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -69548,6 +70219,14 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
+"tMu" = (
+/obj/structure/machinery/cm_vending/clothing/commanding_officer{
+ pixel_y = 0
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/living/commandbunks)
"tMW" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -69771,6 +70450,28 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_a_p)
+"tSv" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ pixel_x = 15
+ },
+/obj/item/paper_bin/uscm{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = -9;
+ pixel_y = 3
+ },
+/obj/item/tool/pen{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"tSw" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
@@ -69783,12 +70484,28 @@
icon_state = "orangecorner"
},
/area/almayer/living/briefing)
-"tTk" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
+"tSF" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/camera{
+ pixel_x = -8;
+ pixel_y = 12
},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
+/obj/item/paper_bin/uscm{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = -8;
+ pixel_y = -1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"tTp" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/condiment/hotsauce/sriracha{
@@ -69955,6 +70672,13 @@
icon_state = "plate"
},
/area/almayer/shipboard/brig/cryo)
+"tXz" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W";
+ pixel_x = -1
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/vehiclehangar)
"tXM" = (
/obj/structure/pipes/vents/pump{
dir = 8
@@ -70013,6 +70737,12 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/lower_medical_lobby)
+"tYv" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/hull/upper_hull/u_f_p)
"tYw" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecalbottomleft";
@@ -70034,12 +70764,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
-"tYM" = (
-/obj/structure/pipes/vents/pump{
- dir = 4
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"tYX" = (
/turf/open/floor/almayer{
icon_state = "test_floor4"
@@ -70189,13 +70913,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/command/computerlab)
-"uaX" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- pixel_x = -1
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_s)
"uaZ" = (
/obj/structure/surface/table/almayer,
/obj/item/weapon/gun/rifle/m41a,
@@ -70219,6 +70936,17 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
+"uck" = (
+/obj/structure/surface/rack,
+/obj/item/stack/cable_coil,
+/obj/item/attachable/flashlight/grip,
+/obj/item/ammo_box/magazine/l42a{
+ pixel_y = 14
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"ucp" = (
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
@@ -70251,36 +70979,15 @@
icon_state = "plate"
},
/area/almayer/command/cic)
-"ucI" = (
-/obj/item/device/flashlight/lamp/green{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/structure/machinery/door_control{
- id = "cl_shutters";
- name = "Privacy Shutters";
- pixel_x = -5;
- pixel_y = 8;
- req_access_txt = "200"
- },
-/obj/structure/machinery/door_control{
- id = "RoomDivider";
- name = "Room Divider";
- pixel_x = -5;
- pixel_y = -4;
- req_access_txt = "200"
+"udb" = (
+/obj/structure/sign/safety/ammunition{
+ pixel_y = 32
},
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/door_control{
- id = "cl_evac";
- name = "Evac Pod Door Control";
- normaldoorcontrol = 1;
- pixel_x = -5;
- pixel_y = 2;
- req_access_txt = "200"
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
},
-/turf/open/floor/carpet,
-/area/almayer/command/corporateliason)
+/area/almayer/medical/upper_medical)
"udi" = (
/turf/open/floor/almayer{
icon_state = "red"
@@ -70338,6 +71045,10 @@
/obj/structure/machinery/firealarm{
pixel_y = -28
},
+/obj/structure/bed/chair/comfy/delta{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -70381,6 +71092,15 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/evidence_storage)
+"ueD" = (
+/obj/structure/machinery/light,
+/obj/structure/machinery/cm_vending/gear/commanding_officer{
+ pixel_y = 0
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/living/commandbunks)
"ueG" = (
/obj/item/bedsheet/orange,
/obj/structure/bed{
@@ -70447,12 +71167,16 @@
icon_state = "cargo"
},
/area/almayer/squads/req)
-"ufL" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors,
+"ufS" = (
+/obj/structure/sign/safety/terminal{
+ pixel_x = 7;
+ pixel_y = 29
+ },
+/obj/structure/filingcabinet,
/turf/open/floor/almayer{
- icon_state = "test_floor4"
+ icon_state = "plate"
},
-/area/almayer/command/cic)
+/area/almayer/command/combat_correspondent)
"ugs" = (
/obj/structure/surface/table/almayer,
/obj/item/book/manual/marine_law{
@@ -70635,11 +71359,13 @@
/turf/open/floor/plating,
/area/almayer/engineering/engineering_workshop/hangar)
"ukA" = (
-/obj/structure/platform,
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
},
-/turf/open/floor/almayer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
/area/almayer/living/briefing)
"ukS" = (
/obj/structure/disposalpipe/segment{
@@ -70728,6 +71454,19 @@
icon_state = "mono"
},
/area/almayer/medical/upper_medical)
+"umR" = (
+/obj/structure/machinery/power/apc/almayer/hardened{
+ cell_type = /obj/item/cell/hyper;
+ dir = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north2)
"umS" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -70745,6 +71484,17 @@
icon_state = "test_floor4"
},
/area/almayer/hull/lower_hull/l_f_p)
+"umY" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
"unh" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/firstaid/o2,
@@ -70795,6 +71545,40 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
+"uoh" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ layer = 3.3;
+ pixel_y = 4
+ },
+/obj/structure/bed{
+ can_buckle = 0
+ },
+/obj/structure/bed{
+ buckling_y = 13;
+ layer = 3.5;
+ pixel_y = 13
+ },
+/obj/item/bedsheet/yellow{
+ layer = 3.2
+ },
+/obj/item/bedsheet/yellow{
+ pixel_y = 13
+ },
+/obj/structure/sign/safety/bathunisex{
+ pixel_x = -16;
+ pixel_y = 8
+ },
+/obj/item/toy/plush/barricade,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/port_emb)
"uoi" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -71039,6 +71823,27 @@
icon_state = "cargo"
},
/area/almayer/engineering/upper_engineering)
+"utw" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+ pixel_x = -5;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+ desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself.";
+ pixel_x = 3;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+ pixel_x = 11;
+ pixel_y = 16
+ },
+/obj/item/storage/box/drinkingglasses{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"utK" = (
/obj/structure/machinery/light{
dir = 4
@@ -71150,24 +71955,14 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/basketball)
-"uva" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/landmark/map_item{
- pixel_x = -8
- },
-/obj/item/toy/plush/therapy/red{
- desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
- force = 15;
- layer = 4.1;
- name = "Sergeant Huggs";
- pixel_x = 7;
- pixel_y = -1;
- throwforce = 15
+"uvk" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
},
/turf/open/floor/almayer{
- icon_state = "plate"
+ icon_state = "orange"
},
-/area/almayer/living/briefing)
+/area/almayer/engineering/upper_engineering/starboard)
"uvs" = (
/obj/structure/machinery/conveyor{
id = "lower_garbage"
@@ -71359,6 +72154,25 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/chemistry)
+"uzb" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
+ },
+/obj/item/tool/screwdriver,
+/obj/item/bananapeel{
+ desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil";
+ icon = 'icons/obj/items/weapons/guns/attachments.dmi';
+ icon_state = "iffbarrel";
+ name = "Broken B8 Smart-Scope";
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/turf/open/floor/almayer{
+ icon_state = "orangefull"
+ },
+/area/almayer/living/briefing)
"uzg" = (
/obj/structure/sign/safety/water{
pixel_x = 8;
@@ -71450,16 +72264,6 @@
icon_state = "red"
},
/area/almayer/shipboard/port_missiles)
-"uAl" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering/port)
"uAs" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -71498,12 +72302,6 @@
icon_state = "emerald"
},
/area/almayer/living/port_emb)
-"uAL" = (
-/obj/structure/bed/chair/wood/normal,
-/obj/item/bedsheet/brown,
-/obj/item/toy/plush/farwa,
-/turf/open/floor/wood/ship,
-/area/almayer/shipboard/brig/cells)
"uAW" = (
/obj/structure/machinery/cryopod{
layer = 3.1;
@@ -71543,12 +72341,6 @@
icon_state = "orange"
},
/area/almayer/hallways/stern_hallway)
-"uBM" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/combat_correspondent)
"uBN" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -71728,6 +72520,12 @@
icon_state = "plate"
},
/area/almayer/hallways/port_hallway)
+"uGa" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/lifeboat_pumps/south2)
"uGc" = (
/obj/structure/machinery/suit_storage_unit/compression_suit/uscm,
/obj/structure/sign/safety/hazard{
@@ -71948,6 +72746,14 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/starboard)
+"uLe" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"uLn" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
@@ -72201,19 +73007,6 @@
icon_state = "plate"
},
/area/almayer/engineering/engineering_workshop/hangar)
-"uRs" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 9;
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"uRt" = (
/obj/structure/machinery/light{
dir = 8
@@ -72408,6 +73201,16 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/processing)
+"uUV" = (
+/obj/structure/machinery/shower,
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/machinery/door/window/tinted{
+ dir = 2
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
"uVb" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/almayer{
@@ -72573,16 +73376,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_lobby)
-"uYd" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22";
- pixel_y = 12
- },
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/lifeboat)
"uYg" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
@@ -72610,16 +73403,17 @@
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
/area/almayer/hallways/repair_bay)
-"uZY" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
+"uZX" = (
+/obj/structure/surface/table/almayer,
+/obj/item/paper{
+ pixel_x = -4;
+ pixel_y = 5
},
-/obj/structure/machinery/light/small{
- dir = 1
+/obj/item/tool/pen,
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
},
-/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
+/area/almayer/living/briefing)
"uZZ" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Basketball Court"
@@ -72638,6 +73432,15 @@
},
/turf/closed/wall/almayer,
/area/almayer/hallways/starboard_umbilical)
+"vba" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/engineering/upper_engineering/port)
"vbf" = (
/obj/structure/machinery/landinglight/ds2/delaytwo{
dir = 8
@@ -72667,23 +73470,6 @@
icon_state = "orange"
},
/area/almayer/squads/bravo)
-"vbP" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 2
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
-"vbR" = (
-/obj/structure/window/framed/almayer,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 1
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"vbS" = (
/obj/structure/closet/secure_closet/personal/patient{
name = "morgue closet"
@@ -73162,16 +73948,6 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
-"vjd" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/command/lifeboat)
"vjg" = (
/obj/structure/prop/almayer/missile_tube{
icon_state = "missiletubesouth"
@@ -73182,6 +73958,19 @@
icon_state = "plating"
},
/area/almayer/shipboard/port_missiles)
+"vjn" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_21"
+ },
+/obj/structure/sign/poster/io{
+ name = "propaganda poster";
+ pixel_y = 32
+ },
+/obj/structure/sign/safety/escapepod{
+ pixel_x = -17
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
"vjx" = (
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/almayer{
@@ -73276,6 +74065,15 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/general_equipment)
+"vkN" = (
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"vkR" = (
/obj/structure/machinery/power/apc/almayer{
dir = 1
@@ -73302,14 +74100,6 @@
icon_state = "orange"
},
/area/almayer/shipboard/brig/processing)
-"vlk" = (
-/obj/structure/closet/emcloset,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/lifeboat)
"vln" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 4
@@ -73327,46 +74117,14 @@
icon_state = "redfull"
},
/area/almayer/shipboard/port_missiles)
-"vlO" = (
-/obj/structure/window/reinforced{
- dir = 4;
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/structure/window/reinforced{
- dir = 8;
- layer = 3.3;
- pixel_y = 4
- },
-/obj/structure/bed{
- can_buckle = 0
- },
-/obj/structure/bed{
- buckling_y = 13;
- layer = 3.5;
- pixel_y = 13
- },
-/obj/item/bedsheet/yellow{
- layer = 3.2
- },
-/obj/item/bedsheet/yellow{
- pixel_y = 13
- },
-/obj/structure/sign/safety/bathunisex{
- pixel_x = -16;
- pixel_y = 8
- },
-/obj/item/toy/plush/barricade,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/port_emb)
"vlR" = (
/obj/structure/machinery/light{
dir = 4
},
/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
/area/almayer/living/briefing)
"vlX" = (
/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep,
@@ -73481,32 +74239,27 @@
},
/area/almayer/lifeboat_pumps/south1)
"vpt" = (
-/obj/structure/bed/chair/comfy/bravo{
- dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin/uscm{
+ pixel_x = 9;
+ pixel_y = 6
},
-/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 = 27;
- serial_number = 11
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 2
},
-/obj/item/stack/folding_barricade,
-/turf/open/floor/almayer{
- icon_state = "orangefull"
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 9
},
-/area/almayer/living/briefing)
-"vpv" = (
-/obj/structure/machinery/shower,
-/obj/structure/window/reinforced/tinted{
- dir = 8
+/obj/structure/prop/holidays/string_lights{
+ dir = 8;
+ pixel_x = 29
},
-/obj/structure/machinery/door/window/tinted{
- dir = 2
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/obj/item/clothing/mask/cigarette/weed,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/upper_engineering/port)
+/area/almayer/living/briefing)
"vpI" = (
/obj/effect/landmark/start/police,
/turf/open/floor/plating/plating_catwalk,
@@ -73699,16 +74452,6 @@
icon_state = "plate"
},
/area/almayer/hallways/hangar)
-"vsI" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/machinery/camera/autoname/almayer{
- name = "ship-grade camera"
- },
-/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"vsJ" = (
/obj/structure/machinery/door/airlock/almayer/maint{
access_modified = 1;
@@ -73766,6 +74509,12 @@
icon_state = "rasputin3"
},
/area/almayer/powered/agent)
+"vtt" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"vtx" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "\improper Bathroom"
@@ -74052,12 +74801,15 @@
/turf/open/floor/almayer,
/area/almayer/engineering/upper_engineering/port)
"vyU" = (
-/obj/structure/bed/chair/comfy/charlie,
/obj/structure/machinery/light{
dir = 4
},
+/obj/structure/bed/chair/comfy/charlie{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
- icon_state = "emeraldfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"vzl" = (
@@ -74233,6 +74985,14 @@
icon_state = "green"
},
/area/almayer/shipboard/brig/cells)
+"vCz" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/lifeboat_pumps/north1)
"vCG" = (
/obj/structure/toilet{
dir = 8
@@ -74257,14 +75017,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/hydroponics)
-"vEf" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"vEj" = (
/obj/structure/prop/invuln/overhead_pipe{
pixel_x = 12
@@ -74273,11 +75025,15 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/synthcloset)
"vEn" = (
-/obj/structure/bed/chair/comfy/bravo{
- dir = 1
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+ layer = 3.3;
+ pixel_x = 15
},
-/obj/item/stack/sheet/mineral/uranium{
- layer = 2.99
+/obj/item/paper,
+/obj/item/tool/pen{
+ pixel_x = -5;
+ pixel_y = 2
},
/turf/open/floor/almayer{
icon_state = "orangefull"
@@ -74395,6 +75151,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer,
/area/almayer/living/port_emb)
+"vHl" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/lifeboat)
"vHq" = (
/obj/item/device/assembly/mousetrap/armed,
/obj/structure/pipes/standard/manifold/hidden/supply{
@@ -74712,6 +75478,14 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/port_hallway)
+"vMC" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"vME" = (
/turf/open/floor/almayer{
dir = 9;
@@ -75047,6 +75821,7 @@
/obj/structure/machinery/firealarm{
pixel_y = 28
},
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -75109,14 +75884,6 @@
/obj/structure/machinery/light/small,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_s)
-"vUk" = (
-/obj/item/storage/toolbox/mechanical{
- pixel_y = 13
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"vUI" = (
/obj/structure/largecrate/random/barrel/white,
/obj/structure/sign/safety/security{
@@ -75183,13 +75950,6 @@
icon_state = "sterile_green"
},
/area/almayer/medical/containment)
-"vVu" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
"vVw" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -75292,27 +76052,6 @@
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
-"vWG" = (
-/obj/structure/pipes/vents/pump,
-/obj/item/tool/soap,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 1
- },
-/obj/structure/sink{
- pixel_y = 24
- },
-/obj/structure/mirror{
- pixel_y = 32
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/shipboard/brig/cells)
"vWJ" = (
/obj/structure/machinery/landinglight/ds1/delaytwo{
dir = 4
@@ -75475,6 +76214,16 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull)
+"vZJ" = (
+/obj/structure/sign/safety/intercom{
+ pixel_x = 8;
+ pixel_y = 32
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/medical/upper_medical)
"wan" = (
/obj/structure/surface/table/almayer,
/obj/item/facepaint/brown,
@@ -75505,18 +76254,15 @@
/area/almayer/hallways/aft_hallway)
"wbe" = (
/obj/structure/surface/table/almayer,
-/obj/effect/landmark/map_item{
- layer = 3.03;
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/prop/helmetgarb/spacejam_tickets{
+/obj/item/reagent_container/food/drinks/coffeecup{
pixel_x = -8;
- pixel_y = 5
+ pixel_y = -1
},
-/obj/item/prop/helmetgarb/spacejam_tickets{
- pixel_x = -8;
- pixel_y = -3
+/obj/item/reagent_container/food/drinks/coffee{
+ pixel_y = 9
+ },
+/obj/item/tool/pen{
+ pixel_x = 5
},
/turf/open/floor/almayer{
icon_state = "plate"
@@ -75552,6 +76298,40 @@
icon_state = "mono"
},
/area/almayer/living/pilotbunks)
+"wbw" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/item/clothing/mask/cigarette/pipe{
+ layer = 2.8;
+ pixel_y = -7
+ },
+/obj/item/reagent_container/spray/cleaner{
+ layer = 3.04;
+ pixel_x = -4;
+ pixel_y = 7
+ },
+/obj/structure/machinery/door_control/brbutton{
+ id = "Brig Lockdown Shutters";
+ name = "Brig Lockdown";
+ pixel_x = -12;
+ pixel_y = 26
+ },
+/obj/structure/machinery/door_control/brbutton{
+ id = "ARES StairsLock";
+ name = "ARES Exterior Lockdown Override";
+ pixel_x = -2;
+ pixel_y = 26
+ },
+/obj/structure/machinery/door_control/brbutton{
+ id = "ARES Emergency";
+ name = "ARES Emergency Lockdown Override";
+ pixel_x = 8;
+ pixel_y = 26
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"wbx" = (
/obj/structure/sign/safety/hazard{
desc = "A sign that warns of a hazardous environment nearby";
@@ -75687,6 +76467,15 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/main_office)
+"wdv" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/engineering/upper_engineering)
"wdz" = (
/obj/effect/landmark/start/marine/engineer/charlie,
/obj/effect/landmark/late_join/charlie,
@@ -75765,6 +76554,27 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_p)
+"wfd" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/tool/stamp/hop{
+ name = "Commanding Officer's rubber stamp";
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/obj/item/paper_bin/uscm{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/obj/item/tool/pen/red/clicky{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/tool/pen/blue/clicky{
+ pixel_x = -6;
+ pixel_y = -3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"wft" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -75913,6 +76723,19 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/south1)
+"wiF" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/machinery/photocopier{
+ anchored = 0
+ },
+/obj/structure/sign/poster/io{
+ name = "propaganda poster";
+ pixel_y = 32
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
"wiG" = (
/obj/structure/sign/poster{
pixel_x = -30;
@@ -76021,12 +76844,6 @@
icon_state = "test_floor4"
},
/area/almayer/medical/medical_science)
-"wkA" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "SE-out"
- },
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
"wkH" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/item/device/whistle{
@@ -76039,17 +76856,6 @@
icon_state = "bluefull"
},
/area/almayer/command/cichallway)
-"wkL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/weapon/gun/rifle/l42a{
- pixel_y = 6
- },
-/obj/item/weapon/gun/rifle/l42a,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"wkM" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
id = "ARES StairsLower";
@@ -76152,6 +76958,16 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south2)
+"wlH" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/turf/open/floor/almayer{
+ icon_state = "emeraldfull"
+ },
+/area/almayer/living/briefing)
"wlK" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -76291,6 +77107,13 @@
icon_state = "rasputin3"
},
/area/almayer/powered/agent)
+"wpj" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 2
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
"wpw" = (
/obj/structure/bed/chair/comfy/ares{
dir = 1
@@ -76344,16 +77167,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/stern_hallway)
-"wqr" = (
-/obj/structure/sign/safety/terminal{
- pixel_x = 7;
- pixel_y = 29
- },
-/obj/structure/filingcabinet,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"wqu" = (
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
@@ -76432,29 +77245,31 @@
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cic_hallway)
"wsP" = (
-/obj/structure/platform{
- dir = 1
- },
/obj/item/prop/helmetgarb/gunoil{
layer = 4.2;
pixel_x = -3;
- pixel_y = 1
+ pixel_y = 6
},
/obj/item/prop/helmetgarb/gunoil{
layer = 4.2;
pixel_x = -10;
- pixel_y = 1
+ pixel_y = 10
},
/obj/item/prop/helmetgarb/gunoil{
layer = 4.2;
pixel_x = 4;
- pixel_y = 1
+ pixel_y = 9
},
/obj/item/weapon/broken_bottle{
- pixel_x = 11;
- pixel_y = -2
+ layer = 4.51;
+ pixel_x = 9;
+ pixel_y = 1
+ },
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/almayer,
/area/almayer/living/briefing)
"wsR" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -76541,18 +77356,6 @@
/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_p)
-"wuT" = (
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- dir = 10;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering/starboard)
"wvb" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -76601,13 +77404,8 @@
},
/area/almayer/living/synthcloset)
"wwk" = (
-/obj/structure/bed/chair/comfy/bravo{
- dir = 1
- },
-/obj/item/stack/folding_barricade,
-/obj/item/stack/sheet/mineral/uranium{
- layer = 2.99
- },
+/obj/structure/surface/table/almayer,
+/obj/effect/landmark/map_item,
/turf/open/floor/almayer{
icon_state = "orangefull"
},
@@ -76729,6 +77527,18 @@
icon_state = "bluefull"
},
/area/almayer/command/cichallway)
+"wyv" = (
+/obj/structure/machinery/door_control{
+ id = "ARES JoeCryo";
+ name = "Working Joe Cryogenics Lockdown";
+ pixel_x = -24;
+ pixel_y = -8;
+ req_one_access_txt = "91;92"
+ },
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/airoom)
"wyO" = (
/obj/structure/largecrate/random/barrel/red,
/obj/structure/prop/invuln/overhead_pipe{
@@ -76780,6 +77590,13 @@
icon_state = "sterile_green"
},
/area/almayer/medical/lower_medical_medbay)
+"wAd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_p)
"wAR" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -76792,12 +77609,32 @@
},
/area/almayer/hallways/port_hallway)
"wAU" = (
-/obj/structure/bed/chair/comfy/delta,
/obj/structure/sign/poster/music{
pixel_x = -27
},
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+ pixel_x = 15
+ },
+/obj/item/paper_bin/uscm{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = -10;
+ pixel_y = -1
+ },
+/obj/item/tool/pen{
+ pixel_x = 3;
+ pixel_y = -4
+ },
+/obj/item/tool/pen{
+ pixel_x = -11;
+ pixel_y = 5
+ },
/turf/open/floor/almayer{
- icon_state = "bluefull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"wBY" = (
@@ -77013,18 +77850,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
-"wFJ" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 8;
- layer = 2.9
- },
-/obj/structure/window{
- pixel_y = -2;
- layer = 2.95
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/commandbunks)
"wFR" = (
/turf/open/floor/almayer,
/area/almayer/living/gym)
@@ -77065,13 +77890,6 @@
/obj/effect/landmark/late_join/delta,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/delta)
-"wGI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
"wGX" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 1
@@ -77178,12 +77996,6 @@
icon_state = "plate"
},
/area/almayer/hallways/vehiclehangar)
-"wJB" = (
-/obj/structure/machinery/cryopod/right,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/airoom)
"wJD" = (
/obj/structure/bed/chair{
dir = 8;
@@ -77205,23 +78017,11 @@
"wJH" = (
/turf/closed/wall/almayer/research/containment/wall/east,
/area/almayer/medical/containment/cell/cl)
-"wJQ" = (
-/obj/item/trash/plate{
- pixel_x = 9;
- pixel_y = 11
- },
-/obj/item/reagent_container/food/snacks/carpmeat{
- layer = 3.3;
- pixel_y = 11;
- pixel_x = 8
- },
-/obj/item/reagent_container/food/snacks/carpmeat{
- layer = 3.3;
- pixel_y = 11;
- pixel_x = 8
+"wJL" = (
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
+/area/almayer/living/briefing)
"wKn" = (
/obj/structure/surface/rack,
/obj/item/facepaint/sniper,
@@ -77253,6 +78053,15 @@
},
/turf/open/floor/plating,
/area/almayer/medical/containment)
+"wKS" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer{
+ dir = 6;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"wLi" = (
/obj/structure/machinery/door_control/airlock{
id = "s_engi";
@@ -77351,9 +78160,13 @@
},
/area/almayer/medical/containment)
"wLV" = (
-/obj/structure/bed/chair/comfy/charlie,
+/obj/structure/machinery/vending/cola{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
- icon_state = "emeraldfull"
+ icon_state = "plate"
},
/area/almayer/living/briefing)
"wMm" = (
@@ -77365,14 +78178,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
-"wMv" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/auxiliary_officer_office)
"wMG" = (
/obj/structure/machinery/cryopod/right{
pixel_y = 6
@@ -77422,14 +78227,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull)
-"wNS" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/lifeboat)
"wNT" = (
/obj/structure/platform,
/turf/open/floor/almayer,
@@ -77511,6 +78308,16 @@
icon_state = "bluefull"
},
/area/almayer/command/cichallway)
+"wQa" = (
+/obj/structure/sign/safety/hazard{
+ pixel_x = 15;
+ pixel_y = 32
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/medical/upper_medical)
"wQg" = (
/turf/open/floor/almayer{
dir = 1;
@@ -77772,17 +78579,6 @@
"wVb" = (
/turf/closed/wall/almayer/outer,
/area/almayer/hull/lower_hull/l_a_s)
-"wVw" = (
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
-/turf/open/floor/plating/almayer,
-/area/almayer/shipboard/brig/armory)
"wVy" = (
/obj/structure/window/reinforced{
dir = 8
@@ -77894,6 +78690,22 @@
icon_state = "blue"
},
/area/almayer/living/pilotbunks)
+"wWJ" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ pixel_y = -1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/port_emb)
"wWL" = (
/obj/item/tool/screwdriver,
/obj/structure/platform_decoration{
@@ -78013,18 +78825,14 @@
/turf/open/floor/plating,
/area/almayer/engineering/ce_room)
"wYZ" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/machinery/photocopier{
- anchored = 0
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
+ name = "\improper Armourer's Workshop";
+ req_access = null
},
-/obj/structure/sign/poster/io{
- pixel_y = 32;
- name = "propaganda poster"
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
},
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
+/area/almayer/hull/upper_hull/u_m_s)
"wZa" = (
/turf/open/floor/almayer{
icon_state = "redcorner"
@@ -78273,22 +79081,20 @@
icon_state = "tcomms"
},
/area/almayer/engineering/engine_core)
-"xfk" = (
-/obj/structure/surface/rack,
-/obj/item/stack/cable_coil,
-/obj/item/attachable/flashlight/grip,
-/obj/item/ammo_box/magazine/l42a{
- pixel_y = 14
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hull/upper_hull/u_m_s)
"xfm" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
/area/almayer/living/cafeteria_officer)
+"xfw" = (
+/obj/structure/surface/table/almayer,
+/obj/item/storage/fancy/cigarettes/lucky_strikes,
+/obj/item/packageWrap,
+/turf/open/floor/almayer{
+ dir = 9;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"xfO" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -78357,6 +79163,16 @@
icon_state = "plating"
},
/area/almayer/hallways/vehiclehangar)
+"xgE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hull/upper_hull/u_m_s)
"xgJ" = (
/obj/structure/machinery/cm_vending/sorted/medical/blood,
/obj/structure/machinery/light{
@@ -78385,9 +79201,6 @@
desc = "A supply crate containing everything you need to stop a CLF uprising.";
name = "\improper USCM crate 'FOB supplies'"
},
-/obj/structure/sign/arcturianstopsign{
- pixel_y = 32
- },
/obj/item/folded_tent/big{
pixel_x = -6;
pixel_y = 10
@@ -78450,14 +79263,6 @@
},
/turf/open/floor/carpet,
/area/almayer/command/cichallway)
-"xik" = (
-/obj/structure/machinery/shower{
- dir = 8
- },
-/obj/item/toy/inflatable_duck,
-/obj/structure/window/reinforced,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
"xiz" = (
/obj/structure/prop/invuln/lattice_prop{
icon_state = "lattice12";
@@ -78485,14 +79290,18 @@
icon_state = "kitchen"
},
/area/almayer/living/grunt_rnr)
-"xjt" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/computer/card{
- dir = 4;
- pixel_x = 2
+"xjw" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
},
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/engineering/upper_engineering/port)
"xjz" = (
/turf/open/floor/almayer{
icon_state = "plating_striped"
@@ -78569,6 +79378,14 @@
icon_state = "emerald"
},
/area/almayer/hallways/port_hallway)
+"xkY" = (
+/obj/structure/bed/chair/comfy/alpha{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"xlk" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer,
@@ -78671,32 +79488,16 @@
icon_state = "test_floor4"
},
/area/almayer/hull/lower_hull/l_a_p)
-"xns" = (
-/obj/structure/machinery/door_control{
- id = "ARES JoeCryo";
- name = "Working Joe Cryogenics Lockdown";
- pixel_x = -24;
- pixel_y = -8;
- req_one_access_txt = "91;92"
- },
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/airoom)
-"xnz" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "red"
- },
-/area/almayer/command/lifeboat)
"xnI" = (
/obj/effect/landmark/start/requisition,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/req)
+"xnQ" = (
+/obj/structure/closet/secure_closet/fridge/meat/stock,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
"xnR" = (
/obj/structure/machinery/door/airlock/almayer/maint{
dir = 1;
@@ -78749,20 +79550,6 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/port)
-"xoS" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 2
- },
-/obj/structure/reagent_dispensers/peppertank{
- pixel_y = -30
- },
-/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/almayer/shipboard/brig/armory)
"xpd" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/manifold/hidden/supply{
@@ -78780,23 +79567,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
-"xpi" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/obj/structure/mirror{
- pixel_x = -29
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/commandbunks)
"xpo" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer{
@@ -78889,9 +79659,13 @@
/turf/closed/wall/almayer,
/area/almayer/command/securestorage)
"xqM" = (
-/obj/structure/platform,
/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/delta{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "bluefull"
+ },
/area/almayer/living/briefing)
"xqS" = (
/obj/effect/decal/warning_stripes{
@@ -78908,14 +79682,6 @@
icon_state = "plate"
},
/area/almayer/shipboard/brig/perma)
-"xrq" = (
-/obj/structure/closet/firecloset,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/command/lifeboat)
"xrr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -78966,6 +79732,12 @@
icon_state = "cargo"
},
/area/almayer/hallways/vehiclehangar)
+"xtg" = (
+/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/command/cic)
"xtD" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/weldpack,
@@ -78983,36 +79755,17 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_lobby)
-"xtQ" = (
-/obj/structure/surface/rack,
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0;
- pixel_x = -6;
- pixel_y = 7
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0;
- pixel_x = -6;
- pixel_y = -3
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0;
- pixel_x = 5;
- pixel_y = 9
- },
-/obj/item/ammo_magazine/rifle/l42a/ap{
- current_rounds = 0;
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/structure/noticeboard{
- desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'";
- pixel_y = 29
+"xub" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
},
+/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle,
/turf/open/floor/almayer{
- icon_state = "plate"
+ dir = 5;
+ icon_state = "plating"
},
-/area/almayer/hull/upper_hull/u_m_s)
+/area/almayer/shipboard/brig/armory)
"xuc" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/extinguisher,
@@ -79195,17 +79948,6 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/aft_hallway)
-"xxa" = (
-/obj/item/stack/sheet/cardboard{
- amount = 50
- },
-/obj/structure/surface/rack,
-/obj/item/packageWrap,
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"xxe" = (
/obj/structure/surface/rack,
/obj/item/tool/crowbar,
@@ -79367,15 +80109,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_a_s)
-"xyL" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "SE-out";
- pixel_x = 1
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south2)
"xyY" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/effect/decal/warning_stripes{
@@ -79405,9 +80138,6 @@
/turf/open/floor/plating,
/area/almayer/hull/upper_hull/u_a_p)
"xzp" = (
-/obj/structure/bed/chair/comfy/bravo{
- dir = 1
- },
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
},
@@ -79424,6 +80154,18 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
+"xzB" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/bed/chair/comfy/delta{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"xAe" = (
/turf/closed/wall/almayer/research/containment/wall/corner,
/area/almayer/medical/containment/cell)
@@ -79453,6 +80195,10 @@
icon_state = "green"
},
/area/almayer/squads/req)
+"xAC" = (
+/obj/structure/surface/rack,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
"xAI" = (
/obj/structure/platform{
dir = 1
@@ -79478,6 +80224,12 @@
"xBe" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/engineering/upper_engineering)
+"xBg" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"xBn" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
id_tag = "Boat1-D3";
@@ -79553,13 +80305,6 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_m_p)
-"xDj" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 2
- },
-/turf/open/floor/almayer,
-/area/almayer/hull/upper_hull/u_f_p)
"xDn" = (
/turf/open/floor/almayer{
dir = 1;
@@ -79585,20 +80330,22 @@
},
/area/almayer/command/airoom)
"xDQ" = (
-/obj/structure/platform,
-/obj/item/trash/USCMtray{
- pixel_y = 4
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/food/snacks/mre_pack/xmas3{
+ pixel_x = 5
},
-/obj/item/trash/USCMtray{
- pixel_y = 6
+/obj/item/reagent_container/food/snacks/mre_pack/xmas2{
+ pixel_x = 5;
+ pixel_y = 9
},
-/obj/item/trash/USCMtray{
- pixel_y = 8
+/obj/effect/landmark/map_item{
+ layer = 3.03;
+ pixel_x = -7;
+ pixel_y = 4
},
-/obj/item/trash/USCMtray{
- pixel_y = 10
+/turf/open/floor/almayer{
+ icon_state = "plate"
},
-/turf/open/floor/almayer,
/area/almayer/living/briefing)
"xEc" = (
/turf/open/floor/almayer{
@@ -79749,6 +80496,25 @@
icon_state = "red"
},
/area/almayer/living/briefing)
+"xGL" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin/uscm{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 2
+ },
+/obj/item/tool/pen{
+ pixel_x = 9;
+ pixel_y = 9
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/briefing)
"xHe" = (
/obj/structure/pipes/vents/pump{
dir = 4
@@ -79857,6 +80623,12 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
+"xJn" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/engineering/upper_engineering/starboard)
"xJC" = (
/obj/structure/machinery/door/airlock/almayer/generic/corporate{
name = "Corporate Liaison's Closet"
@@ -79880,12 +80652,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
-"xJT" = (
-/obj/structure/toilet{
- dir = 4
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/shipboard/brig/cells)
"xKM" = (
/obj/structure/machinery/status_display{
pixel_x = 16;
@@ -80075,14 +80841,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/starboard_hallway)
-"xNL" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NW-out";
- pixel_x = -1;
- pixel_y = 2
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/vehiclehangar)
"xOL" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -80111,13 +80869,20 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_s)
"xPR" = (
-/obj/structure/platform{
- dir = 1
- },
/obj/structure/pipes/vents/scrubber{
dir = 4
},
-/turf/open/floor/almayer,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+ dir = 1
+ },
+/obj/item/reagent_container/food/snacks/grown/banana{
+ pixel_x = 18;
+ pixel_y = 5
+ },
+/turf/open/floor/almayer{
+ icon_state = "orangefull"
+ },
/area/almayer/living/briefing)
"xPZ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -80447,14 +81212,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_s)
-"xUV" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"xVc" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/machinery/door_control{
@@ -80593,11 +81350,6 @@
icon_state = "mono"
},
/area/almayer/medical/medical_science)
-"xYe" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/weldingtool,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_m_s)
"xYf" = (
/obj/structure/machinery/cm_vending/clothing/sea,
/turf/open/floor/almayer{
@@ -80621,15 +81373,6 @@
icon_state = "orange"
},
/area/almayer/shipboard/brig/cells)
-"xYr" = (
-/obj/structure/machinery/light,
-/obj/structure/machinery/cm_vending/gear/commanding_officer{
- pixel_y = 0
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
- },
-/area/almayer/living/commandbunks)
"xYB" = (
/obj/structure/sign/safety/storage{
pixel_x = 8;
@@ -80663,6 +81406,13 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering)
+"xZf" = (
+/obj/structure/machinery/light,
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/command/cic)
"xZI" = (
/obj/structure/prop/invuln/lattice_prop{
dir = 1;
@@ -80856,6 +81606,10 @@
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering/port)
+"ydr" = (
+/obj/structure/largecrate/supply/weapons/pistols,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_m_s)
"ydx" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -80953,6 +81707,16 @@
icon_state = "plate"
},
/area/almayer/hallways/hangar)
+"yeO" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"yeP" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -80968,18 +81732,13 @@
},
/turf/open/floor/wood/ship,
/area/almayer/shipboard/brig/chief_mp_office)
-"yff" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
- density = 0;
- pixel_y = 16
- },
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "cargo"
+"yeX" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
},
-/area/almayer/command/cic)
+/obj/structure/closet/secure_closet/guncabinet/blue/riot_control,
+/turf/open/floor/plating/almayer,
+/area/almayer/shipboard/brig/armory)
"yfm" = (
/obj/effect/landmark/start/marine/delta,
/obj/effect/landmark/late_join/delta,
@@ -81024,18 +81783,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
-"yfG" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/machinery/power/apc/almayer{
- dir = 8
- },
-/obj/item/storage/briefcase{
- pixel_y = 15
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"yfS" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -81052,6 +81799,18 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
+"ygs" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 1
+ },
+/obj/structure/machinery/door/airlock/almayer/generic{
+ name = "\improper Bathroom"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/captain_mess)
"ygy" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -81067,6 +81826,16 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
+"ygM" = (
+/obj/structure/sign/safety/ammunition{
+ pixel_x = 32;
+ pixel_y = 7
+ },
+/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/medical/upper_medical)
"yhI" = (
/turf/open/floor/almayer{
dir = 4;
@@ -81114,6 +81883,17 @@
},
/turf/open/floor/almayer,
/area/almayer/engineering/engineering_workshop/hangar)
+"yiL" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ name = "General Listening Channel";
+ pixel_y = -28
+ },
+/turf/open/floor/almayer,
+/area/almayer/hull/upper_hull/u_f_s)
"yiW" = (
/obj/structure/machinery/cryopod/right{
layer = 3.1;
@@ -81188,6 +81968,16 @@
icon_state = "cargo"
},
/area/almayer/hull/lower_hull/l_m_s)
+"ykD" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer{
+ dir = 5;
+ icon_state = "red"
+ },
+/area/almayer/command/lifeboat)
"ykF" = (
/obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
/turf/open/floor/almayer{
@@ -81238,6 +82028,12 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
+"ylg" = (
+/obj/structure/machinery/cryopod/right,
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/airoom)
"ylJ" = (
/obj/structure/sign/safety/maint{
pixel_x = 8;
@@ -89850,15 +90646,15 @@ tak
tak
bvx
xys
-ldu
+qan
eRL
eRL
mLJ
eiO
xFs
xkd
-teE
-xJT
+eiH
+aTV
xkd
xkd
xkd
@@ -90060,9 +90856,9 @@ iqn
eRL
tmy
xkd
-vWG
-lJL
-dQp
+rUB
+dSn
+soa
xzu
xkd
xkd
@@ -90263,8 +91059,8 @@ aJz
dXy
nHg
xkd
-xik
-bjQ
+ghX
+rAv
xkd
eTo
iHG
@@ -92097,7 +92893,7 @@ eZH
ohJ
thL
thL
-uAL
+aHT
liZ
rUk
jVa
@@ -92679,9 +93475,9 @@ pCi
rPC
rwS
lrq
-kTc
+fFq
uqo
-wVw
+rhD
cqn
gTx
eRL
@@ -92882,9 +93678,9 @@ ahE
rPC
nfI
lrq
-omu
+eTx
uqo
-sYB
+hGa
cqn
ldu
eRL
@@ -93085,9 +93881,9 @@ ahE
rPC
heV
lrq
-frJ
+lCn
uqo
-ktn
+xub
cqn
nBb
mdS
@@ -93288,9 +94084,9 @@ ahE
wcn
nBc
lrq
-vsI
+ebt
uqo
-xoS
+lLN
lrq
mAT
lrq
@@ -93491,7 +94287,7 @@ pCi
wcn
wcn
lrq
-mAr
+yeX
uqo
fsT
jnA
@@ -93694,7 +94490,7 @@ pCi
oCL
wcn
lrq
-uZY
+ebz
uqo
uqo
uqo
@@ -93897,7 +94693,7 @@ pCi
rPC
aou
lrq
-mAr
+yeX
uqo
uvy
tfO
@@ -94210,8 +95006,8 @@ poR
mGL
pNp
kcp
-wMv
-nCR
+pNK
+bIA
alU
uDn
bKf
@@ -94618,9 +95414,9 @@ bTS
lxo
qcy
kcp
-kmk
-kmk
-mIJ
+edM
+edM
+mcl
bLt
bXX
bKh
@@ -94821,9 +95617,9 @@ oQM
aqI
aqI
kcp
-jaK
-jxP
-xNL
+pUl
+tXz
+rYZ
bLu
bBB
bBB
@@ -98053,7 +98849,7 @@ aaa
nXP
ndx
uNL
-nDd
+eRt
soS
sgy
nsu
@@ -98256,9 +99052,9 @@ aaa
nXP
hJp
uNL
-gka
+lUv
bwQ
-oNf
+gUr
uNL
aNw
kXJ
@@ -98600,7 +99396,7 @@ ukU
bfP
fvv
vcK
-wGI
+wAd
tuA
tuA
tuA
@@ -99614,9 +100410,9 @@ vCO
vCO
vCO
jxB
-xDj
-boc
-eXS
+wpj
+gDq
+tJo
bGr
hnV
xEF
@@ -99817,9 +100613,9 @@ wmT
jhW
mWD
jxB
-gvW
-sWs
-imJ
+hWX
+tYv
+mRU
xuB
gpe
xEF
@@ -99980,7 +100776,7 @@ aad
aai
aai
pCi
-pmI
+nMM
avl
avl
agj
@@ -100022,7 +100818,7 @@ aES
aES
aES
aES
-vbP
+lDj
uEv
gpe
xEF
@@ -100181,20 +100977,20 @@ aaa
aaa
aad
ahE
-qKt
-dKa
-hdb
+iuT
+nna
+svp
avl
agj
agj
-oTM
-mTc
-sLZ
-yfG
-lQi
+wbw
+npK
+hBW
+tHU
+tMu
kcN
-twI
-ufL
+dkn
+gye
aic
aov
wVW
@@ -100384,20 +101180,20 @@ aaa
aaa
aad
ahE
-ooo
-uaX
-kfR
+afc
+npB
+umY
avl
agj
-lDD
+laG
agc
-qfD
+aUP
agc
-kJm
-xYr
+ktc
+ueD
kcN
cod
-ufL
+gye
aic
aov
wVW
@@ -100590,17 +101386,17 @@ ahE
aiV
wBY
hJJ
-qCi
+anl
agj
-crw
-wJQ
+fuR
+ouT
agc
agc
-kJm
-rbE
+ktc
+nKs
kcN
-yff
-ufL
+muQ
+gye
aic
aKq
luZ
@@ -100793,13 +101589,13 @@ pCi
kwS
avl
avl
-mRp
+yiL
agj
-nCx
-tYM
-mqb
-kDK
-jMx
+utw
+kmY
+pSH
+mES
+lWD
mXj
kcN
kcN
@@ -100998,14 +101794,14 @@ avl
hCo
lIh
agj
-keT
+fiP
hvH
-bVs
+pYp
hvH
hvH
-aOj
-bQl
-xpi
+iIm
+odC
+cQD
agj
bFA
aov
@@ -101201,14 +101997,14 @@ avl
hMI
lFb
agj
-dyj
-fnv
-bVs
-iPu
-dFb
+mcK
+xBg
+pYp
+isu
+oBW
mXj
-wFJ
-kJW
+drp
+tqI
agj
aic
aoA
@@ -101406,7 +102202,7 @@ tDx
agj
mXj
mXj
-lul
+nRQ
mXj
mXj
mXj
@@ -101608,12 +102404,12 @@ jgM
lFb
agj
mXj
-pjR
-jND
-aKk
-aKk
-nCU
-faE
+yeO
+nQH
+lnZ
+lnZ
+pxL
+mzG
mXj
agj
amI
@@ -101810,17 +102606,17 @@ avl
jpJ
lzH
agj
-qlI
-cdB
-xjt
-coD
+iET
+akr
+lfT
+jNY
agc
-ako
-tYM
-hGB
+jCn
+kmY
+rEJ
agj
aic
-acS
+esy
wVW
asQ
awG
@@ -102013,19 +102809,19 @@ avl
llM
lGL
agj
-eBE
+jPn
hvH
agc
-azm
+euM
pxG
-fOv
+klG
agc
agc
agj
aic
-sxW
+cHA
wVW
-abQ
+nww
atN
cEl
sOi
@@ -102216,21 +103012,21 @@ avl
avl
mrc
agj
-kSH
+huR
hvH
-nTA
-qmZ
+gfK
+rqH
agc
-aiW
+nnG
xyk
xyk
-mDX
-aTl
-dLe
+oys
+nDV
+joE
wVW
-atx
+qyJ
qEk
-ajm
+ksv
wVW
arP
alX
@@ -102242,7 +103038,7 @@ hkG
wVW
fvB
qEk
-iaa
+aGi
wVW
aKn
aKz
@@ -102419,19 +103215,19 @@ pCi
jTi
nRq
agj
-kVT
+wfd
hvH
agc
-qlp
+pJe
pxG
-tTk
+vtt
agc
agc
agj
-fXP
+lPG
aov
wVW
-atx
+qyJ
qEk
ato
wVW
@@ -102445,7 +103241,7 @@ aEB
wVW
fvB
qEk
-iaa
+aGi
wVW
aKn
aKz
@@ -102622,19 +103418,19 @@ pCi
avl
myn
agj
-kNq
+rfv
hvH
qck
-gVd
+jEX
agc
-tan
-kDK
-iEz
+ssn
+mES
+lUw
agj
aic
aov
wVW
-ssW
+nbr
qEk
hrm
wVW
@@ -102648,7 +103444,7 @@ aEC
wVW
dNZ
qEk
-mje
+xZf
wVW
aKn
aKz
@@ -102826,18 +103622,18 @@ cnX
lIh
agj
mXj
-fnv
+xBg
hvH
hvH
-iNY
+bVg
hvH
-jhB
+pJK
mXj
agj
aic
aoA
wVW
-atx
+qyJ
jvX
ato
wVW
@@ -102849,9 +103645,9 @@ alX
aIf
aED
wVW
-ryR
+xtg
jvX
-iaa
+aGi
wVW
aKn
aKy
@@ -103872,7 +104668,7 @@ aJc
ecr
ecr
ecr
-ohS
+ygs
aET
nUv
aJU
@@ -104074,8 +104870,8 @@ cST
aTz
aUl
aET
-esC
-nsQ
+aWA
+jgu
aET
mSi
wHp
@@ -104273,7 +105069,7 @@ aGV
rvA
aKE
awF
-jzE
+iYR
aUw
aUm
aET
@@ -104648,7 +105444,7 @@ awW
add
add
add
-stu
+juf
add
add
add
@@ -104694,7 +105490,7 @@ baw
aJU
aJU
aJU
-tBu
+hey
aJU
aJU
aJU
@@ -105048,7 +105844,7 @@ bdH
aaC
abs
adq
-myl
+jWH
ajI
add
fsU
@@ -105106,7 +105902,7 @@ qys
gBW
aJU
tiW
-qgU
+pUe
pgD
tQV
aaC
@@ -105278,13 +106074,13 @@ umS
yjM
qbO
aqw
-hnI
+qRL
bYe
amO
wZM
aPm
awF
-nvG
+aHk
vGI
aLp
awF
@@ -105489,7 +106285,7 @@ ejp
awF
aHn
szU
-fGa
+aLt
awF
aRC
aUw
@@ -105657,7 +106453,7 @@ aaa
aaY
abs
adq
-tGj
+ckE
ajI
add
fsU
@@ -105715,7 +106511,7 @@ qys
gBW
aJU
tiW
-bpw
+hXD
pgD
tQV
aaY
@@ -106069,7 +106865,7 @@ aoC
add
add
add
-stu
+juf
add
add
add
@@ -106115,7 +106911,7 @@ baw
aJU
aJU
aJU
-nnX
+eyv
aJU
aJU
aJU
@@ -106793,7 +107589,7 @@ bsk
sxu
cBI
bkA
-eFG
+nuI
bej
arX
vSG
@@ -106898,7 +107694,7 @@ aiX
aiX
aiX
sHM
-kUh
+otK
aiX
aiX
aiX
@@ -107094,7 +107890,7 @@ awW
awW
awW
fSm
-hiy
+vCz
apl
bbL
bbL
@@ -107297,7 +108093,7 @@ ajf
ajf
ajf
oAO
-pIZ
+dlN
aod
qgG
amC
@@ -107500,7 +108296,7 @@ awW
awW
awW
aSJ
-isI
+dAi
dtM
aii
mce
@@ -109535,7 +110331,7 @@ dtM
akU
ajC
sqf
-anp
+wQa
wjz
fnA
jZY
@@ -109738,7 +110534,7 @@ dtM
aii
ajC
sqf
-sOZ
+udb
oNJ
eDo
eDo
@@ -109941,7 +110737,7 @@ dtM
ajt
aik
sqf
-anq
+eTh
awn
xsz
jTj
@@ -110144,11 +110940,11 @@ dtM
aii
ajC
sqf
-anr
+vZJ
awn
tEi
-asu
-hbI
+iWb
+ygM
sqf
ajl
vtx
@@ -111895,8 +112691,8 @@ bJt
xOL
gGI
eeu
-nbB
-ksA
+dqQ
+ccm
gAz
fiq
uaa
@@ -112298,7 +113094,7 @@ buH
bHL
buH
lhB
-nbB
+tAJ
bDs
bIJ
bDs
@@ -112603,7 +113399,7 @@ kSJ
avj
cGr
awE
-qkm
+vjn
wQv
rne
guC
@@ -112918,7 +113714,7 @@ jFE
jFE
idx
hAz
-fhQ
+hQh
bJt
vhI
oed
@@ -113117,11 +113913,11 @@ vzP
bJt
hjB
bJt
-dpn
+neF
bDs
gSk
bDs
-pdt
+khX
bJt
kTq
oed
@@ -113215,7 +114011,7 @@ awE
bqy
bYj
eUR
-ucI
+gEI
nDh
bYj
xne
@@ -113730,7 +114526,7 @@ rBj
bDs
gSk
bDs
-oMd
+hWS
bJt
oDf
uqH
@@ -113933,7 +114729,7 @@ bJt
oKb
gSk
bDs
-pdt
+ign
bJt
sIx
bxX
@@ -114538,7 +115334,7 @@ qBM
wXI
nUd
lkd
-oMd
+xnQ
bDs
gSk
oDE
@@ -115038,12 +115834,12 @@ ajr
aii
avm
awE
-wYZ
+wiF
rne
rne
fAo
awE
-bhM
+knT
wQv
bBi
awE
@@ -115450,7 +116246,7 @@ rne
wft
awE
hpf
-qJU
+pbl
igp
awE
hoX
@@ -115515,8 +116311,8 @@ wsP
izr
aSh
ccF
-tGG
-tGG
+rFV
+iXR
bdg
aLG
awb
@@ -115546,12 +116342,12 @@ buH
hOR
buH
bdg
-sNI
+cxZ
wAU
diw
-csG
-sNI
-wNT
+tSv
+cxZ
+ffl
wbe
bdd
qXo
@@ -115713,13 +116509,13 @@ hhw
umv
hhw
bdd
-bqZ
-kbV
-tGG
-tGG
-tGG
+hjT
+jZr
tGG
+fHe
tGG
+sBs
+iXR
bdg
aLG
aYO
@@ -115749,13 +116545,13 @@ buH
bHL
buH
bdg
-sNI
-sNI
-sNI
-sNI
+cxZ
+hnH
+kXH
+kfG
dkH
cKX
-bqZ
+oqP
bdd
tLc
rsM
@@ -115908,7 +116704,7 @@ kxd
jgk
nsY
rSG
-rur
+wWJ
oqS
nsY
lhu
@@ -115917,12 +116713,12 @@ aSm
eoM
bdd
vTt
-kbV
-tGG
-tGG
-tGG
-tGG
+tgE
+tgE
+fNu
tGG
+gmp
+iXR
bdg
aLG
aYO
@@ -115952,13 +116748,13 @@ buH
bHL
buH
bdg
-sNI
+cxZ
csG
sNI
-sNI
+mgR
gNi
-wNT
-cab
+wJL
+oMC
bdd
hxZ
rsM
@@ -116119,14 +116915,14 @@ aSm
aSm
kOf
bdd
-bDQ
-kbV
-tGG
+dYH
+bDP
+tgE
okB
-tGG
+tgE
crK
-tGG
-bdg
+xkY
+bdd
beB
aYT
beB
@@ -116154,11 +116950,11 @@ bCx
buH
bHL
buH
-bdg
-sNI
-sNI
-sNI
-sNI
+bdd
+qWy
+uZX
+wJL
+wJL
eCS
xqM
udV
@@ -116313,7 +117109,7 @@ gsg
vHq
vvY
nsY
-rNb
+pPV
bxC
jiU
nsY
@@ -116322,12 +117118,12 @@ mhl
aSm
ylY
bdd
-bqZ
qgw
-beH
-qMR
+qgw
+qgw
+tMc
vlR
-dRT
+uLe
qin
pmv
tBF
@@ -116358,13 +117154,13 @@ bFu
omW
bFu
hLS
-eBg
-eBg
-eBg
-eBg
-fOk
+vKe
+vKe
+sgE
+ljz
+xzB
epq
-bqZ
+fCt
bdd
hTf
rKO
@@ -116721,20 +117517,20 @@ wNl
nGh
fPp
lqN
-vlO
+uoh
nsY
xCN
pOB
hfk
aLf
bdd
-bqZ
+gVm
kKL
-aLJ
-eBg
+gOm
+hFX
dAO
cEG
-eBg
+vKe
dYX
tBF
lBz
@@ -116764,13 +117560,13 @@ buH
uXu
bFu
iUk
-eBg
+cIl
gkJ
-eBg
-eBg
+vKe
+cum
mVZ
kTx
-bqZ
+jIG
bdd
hTf
wRO
@@ -116931,14 +117727,14 @@ lQu
lQu
aSm
bdd
-bDQ
+iFG
iWE
jUo
-wmz
-wmz
+iXd
+iXd
wwk
-wmz
-bdg
+hMJ
+bdd
aLG
awb
aLG
@@ -116966,14 +117762,14 @@ bdg
buH
hOR
buH
-bdg
+bdd
wLV
nza
-wLV
-wLV
-wLV
+mwz
+mwz
+mwz
ukA
-bqZ
+jIG
bdd
gKB
rsM
@@ -117134,13 +117930,13 @@ yfy
ugV
vUi
bdd
-vTt
-kbV
+jEI
+iXd
xzp
vEn
wmz
-wmz
-wmz
+npS
+qsa
bdg
aLG
aYO
@@ -117170,13 +117966,13 @@ bGe
bHL
buH
bdg
-wLV
-wLV
-wLV
-wLV
-gKH
+kxF
+elX
+gAj
+bHS
+aLA
ldj
-cab
+oMC
bdd
sOt
cNX
@@ -117337,13 +118133,13 @@ aLf
qce
aSm
bdd
-bqZ
+gcw
xPR
nIW
+uzb
wmz
-wmz
-wmz
-wmz
+idJ
+qsa
bdg
beB
aYT
@@ -117373,13 +118169,13 @@ bJz
bHT
bJz
bdg
-wLV
-wLV
-wLV
-wLV
-wLV
-wNT
-udV
+kxF
+lad
+thE
+hIt
+gAj
+wlH
+sGX
bdd
pEl
roU
@@ -117388,7 +118184,7 @@ uVh
nsY
kzK
lFh
-jYc
+mus
pVA
mzV
pML
@@ -117540,13 +118336,13 @@ aLf
tRc
qEW
bdd
-uva
+gGo
mLb
-wmz
+qmB
vpt
kQU
-wmz
-wmz
+rdb
+kQU
bdg
aLG
aYO
@@ -117579,8 +118375,8 @@ bdg
gKH
cgz
vyU
-wLV
-wLV
+xGL
+vkN
xDQ
bXc
bdd
@@ -118457,7 +119253,7 @@ abg
caF
aar
aar
-lIl
+wYZ
aar
aar
ael
@@ -118659,10 +119455,10 @@ bWs
abg
caF
aar
-vUk
+rcW
sTB
-lUA
-tqd
+jrV
+qmr
ael
afE
agT
@@ -118862,9 +119658,9 @@ acO
aJs
cbN
aar
-fQY
+lDK
aap
-elM
+eXU
vFb
ael
afH
@@ -119065,10 +119861,10 @@ pNQ
abx
hTy
aar
-thR
+pJn
aao
aao
-gDP
+erz
ael
afI
agY
@@ -119268,10 +120064,10 @@ acP
bUE
qFQ
aar
-xtQ
+jBY
aap
aao
-sxT
+mYX
ael
afJ
agY
@@ -119471,10 +120267,10 @@ acG
abx
caF
aar
-com
+ydr
aap
aao
-sxT
+mYX
ael
afK
ahc
@@ -119676,7 +120472,7 @@ lCz
aar
tAV
sTB
-xfk
+uck
wKn
ael
afL
@@ -119877,7 +120673,7 @@ acG
abx
caF
aar
-lIl
+wYZ
aar
aar
aar
@@ -120082,8 +120878,8 @@ arJ
aar
aao
aao
-wkL
-mts
+rOZ
+dfP
adO
afM
fpR
@@ -120283,10 +121079,10 @@ jSY
abx
hTy
aar
-hLB
+lAj
aao
aao
-laY
+xgE
adO
afN
ahh
@@ -120486,10 +121282,10 @@ acP
bUE
qFQ
aar
-xYe
-kZH
+jkL
+iaE
aao
-frY
+mXa
adO
afO
ahh
@@ -120689,10 +121485,10 @@ aJa
abg
ccf
aar
-mko
+cRg
uaZ
aap
-svC
+epK
adO
jkj
ahh
@@ -121621,7 +122417,7 @@ rbY
gwD
bOK
bPD
-bYa
+nSj
bPD
jOk
bNB
@@ -121824,7 +122620,7 @@ rbY
bEc
bKA
bCA
-bQS
+gJs
bCA
bKA
bEc
@@ -121902,7 +122698,7 @@ aeA
aeC
aeC
aeC
-cVb
+tpt
aeC
aeC
aeC
@@ -121950,7 +122746,7 @@ lJY
vcE
vcE
vcE
-iTd
+oDO
vcE
vcE
vcE
@@ -122237,7 +123033,7 @@ bmD
mYv
doP
jac
-xxa
+isS
cai
bdl
bII
@@ -122302,7 +123098,7 @@ aag
aag
abh
acx
-pMk
+adQ
ajs
aeC
wXh
@@ -122362,7 +123158,7 @@ eyG
kpo
vcE
kUV
-xyL
+mvH
rRq
uOi
aag
@@ -122504,8 +123300,8 @@ aah
aah
aah
abi
-nGY
-gyU
+acE
+adZ
ajk
aeA
asY
@@ -122565,8 +123361,8 @@ deg
wLu
lJY
xVS
-kPH
-knL
+fqg
+uGa
uyC
aah
aah
@@ -122628,7 +123424,7 @@ aYW
bzV
beB
mCo
-iwZ
+xfw
lBF
bKA
sbM
@@ -122643,7 +123439,7 @@ bmD
lyk
bOR
eHa
-cmo
+opj
xAB
mCo
bJz
@@ -122707,8 +123503,8 @@ bdH
bdH
bdH
abi
-dEJ
-gyU
+acT
+adZ
ajk
aeA
atp
@@ -122768,8 +123564,8 @@ pfH
wlF
lJY
xVS
-kPH
-qGU
+fqg
+mIA
uyC
bdH
aaa
@@ -122911,7 +123707,7 @@ aaa
bdH
abh
acx
-gCB
+umR
ajs
aeC
wXh
@@ -122971,7 +123767,7 @@ eyG
kpo
vcE
kUV
-bxA
+pPF
rRq
uOi
bdH
@@ -123323,7 +124119,7 @@ amH
aeC
aeC
aeC
-cVb
+tpt
aeC
aeC
aeC
@@ -123371,7 +124167,7 @@ kKR
vcE
vcE
vcE
-iTd
+oDO
vcE
vcE
vcE
@@ -123456,7 +124252,7 @@ bZr
bNQ
bNQ
bNQ
-bGz
+ohl
hMs
cbw
iEb
@@ -123659,7 +124455,7 @@ bZr
krN
krN
krN
-oqY
+llt
can
buH
iEb
@@ -123765,9 +124561,9 @@ alG
anG
apf
oIB
-jgr
-gGp
-dMf
+tSF
+qyM
+jog
oIB
sFR
vuv
@@ -123862,7 +124658,7 @@ bZr
ibc
uly
bNN
-vbR
+fXt
pky
cbv
cbS
@@ -123968,9 +124764,9 @@ alG
aYD
uPI
oIB
-fXE
-kaS
-aiQ
+hJh
+vMC
+iUC
oIB
sFR
vuv
@@ -124171,9 +124967,9 @@ sUF
anG
apd
oIB
-wqr
+ufS
bZw
-xUV
+kaJ
oIB
sFR
hPo
@@ -124268,7 +125064,7 @@ bZr
bKA
dyx
eYr
-bUo
+iii
uys
cbz
cbU
@@ -124375,8 +125171,8 @@ aYD
aTS
qgK
tEB
-uBM
-dXo
+llD
+gGl
oIB
lBR
nVu
@@ -124471,7 +125267,7 @@ bmD
bKA
dyx
hGN
-pVx
+ddN
uys
ttM
iEb
@@ -124578,8 +125374,8 @@ anG
mPX
oIB
wKF
-hzb
-ltU
+fOh
+diM
oIB
fbx
cFA
@@ -124780,9 +125576,9 @@ aSC
aZH
iAB
oIB
-phj
-vEf
-cNK
+gqF
+imW
+qbh
oIB
fbx
cxo
@@ -124983,8 +125779,8 @@ rFY
ctC
gPF
oIB
-opI
-dha
+kUb
+rJg
pxj
oIB
fbx
@@ -127005,8 +127801,8 @@ auu
aoT
aFm
xBe
-aIV
-qqr
+cij
+jRZ
arH
xBe
alG
@@ -127413,7 +128209,7 @@ anO
nFX
atv
auV
-amE
+ift
xBe
alG
aDZ
@@ -127616,7 +128412,7 @@ atc
nFX
atv
auV
-amE
+ift
xBe
alG
aYj
@@ -128020,8 +128816,8 @@ atq
aDr
aFu
xBe
-azp
-qJf
+rwT
+wdv
anV
xBe
alG
@@ -131277,7 +132073,7 @@ vuv
vuv
jWh
jWh
-sWC
+olk
jWh
jWh
jWh
@@ -131479,10 +132275,10 @@ vuv
nfS
emx
jWh
-duz
-hXG
-htG
-doU
+qCg
+xjw
+pfA
+xAC
jWh
lbB
uIv
@@ -131682,10 +132478,10 @@ iEs
cxo
cxo
jWh
-axR
-mIP
-tcZ
-fWi
+uUV
+rsW
+djN
+fnQ
jWh
lbB
cKL
@@ -131885,10 +132681,10 @@ vuv
xct
cxo
jWh
-vpv
-pgw
-rmE
-fWi
+dkS
+vba
+naQ
+fnQ
jWh
xPZ
pcv
@@ -132069,7 +132865,7 @@ ptK
dmQ
psm
psm
-lDn
+qyH
arV
wZX
eky
@@ -132083,7 +132879,7 @@ aDQ
eky
wZX
arV
-wkA
+dtv
vuv
vuv
cxo
@@ -132271,8 +133067,8 @@ hWU
dmQ
aeq
psm
-xrq
-vVu
+aNe
+hiN
arV
wZX
eky
@@ -132286,8 +133082,8 @@ aHe
eky
wZX
arV
-oIt
-xrq
+fXM
+aNe
vuv
ahb
cxo
@@ -132474,8 +133270,8 @@ rwb
dmQ
jXY
psm
-vlk
-mKy
+atY
+qkj
aMT
svl
pzJ
@@ -132489,8 +133285,8 @@ qDt
pzJ
sQO
aMT
-wNS
-vlk
+rWF
+atY
vuv
woM
nqD
@@ -132678,7 +133474,7 @@ dmQ
atD
psm
psm
-vjd
+vHl
aRp
jBX
akS
@@ -132692,7 +133488,7 @@ aHe
tKf
jBX
aRp
-quy
+edx
vuv
vuv
myC
@@ -133074,8 +133870,8 @@ cuC
bNM
tgK
tfb
-wuT
-lMx
+skg
+eaX
pVZ
pVZ
pVZ
@@ -133107,8 +133903,8 @@ qMu
qMu
qMu
qMu
-jFY
-qKY
+euY
+iuw
jHL
wOK
uIv
@@ -133277,8 +134073,8 @@ cuC
riJ
kHY
uhM
-kdv
-lkm
+uvk
+xJn
cuC
aag
aag
@@ -133310,8 +134106,8 @@ aag
aag
aag
bYn
-dRs
-uAl
+tAh
+bfe
rDb
qjV
rID
@@ -133480,7 +134276,7 @@ cuC
cuC
umy
iKZ
-pnL
+tiw
cuC
cuC
mNX
@@ -133514,7 +134310,7 @@ mNX
qOk
bYn
bYn
-cWE
+qQL
kHS
rID
bYn
@@ -134507,8 +135303,8 @@ xVk
xVk
aad
jbq
-kRg
-uRs
+jXW
+jcZ
aDO
qqu
eky
@@ -134516,8 +135312,8 @@ aNl
eky
dFk
aDO
-nPY
-kRg
+nzI
+jXW
jbq
ajZ
xVk
@@ -134710,8 +135506,8 @@ xVk
xVk
aad
jbq
-hBL
-dID
+qtR
+jWC
eky
eky
nJu
@@ -134719,8 +135515,8 @@ aNl
eky
eky
eky
-etn
-hBL
+aDc
+qtR
jbq
ajZ
xVk
@@ -134914,7 +135710,7 @@ xVk
eJQ
aPw
aHe
-mRQ
+dnJ
eky
eky
eky
@@ -134922,7 +135718,7 @@ aNl
eky
eky
eky
-biJ
+hfw
aHe
aPw
eJQ
@@ -136741,7 +137537,7 @@ xVk
oee
aPw
aHe
-iTe
+tqB
eky
eky
atg
@@ -136749,7 +137545,7 @@ aBE
ouB
eky
eky
-qPX
+gwu
aHe
aPw
oee
@@ -136943,8 +137739,8 @@ xVk
xVk
aad
jbq
-xrq
-dID
+aNe
+jWC
eky
eky
esT
@@ -136952,8 +137748,8 @@ nYE
orH
eky
eky
-etn
-xrq
+aDc
+aNe
jbq
ajZ
xVk
@@ -137146,8 +137942,8 @@ xVk
xVk
aad
jbq
-vlk
-dID
+atY
+jWC
eky
eky
bAe
@@ -137155,8 +137951,8 @@ aBG
sGh
eky
eky
-etn
-vlk
+aDc
+atY
jbq
ajZ
xVk
@@ -137349,8 +138145,8 @@ xVk
xVk
aad
aPw
-uYd
-xnz
+qpU
+ykD
dqj
eky
xaS
@@ -137358,8 +138154,8 @@ ejt
mPf
eky
gUV
-neG
-uYd
+wKS
+qpU
aPw
ajZ
xVk
@@ -140446,9 +141242,9 @@ lmz
lmz
lmz
daz
-ltc
-eXk
-xns
+rzf
+bRo
+wyv
pTt
gAe
rCi
@@ -140649,9 +141445,9 @@ lmz
lmz
lmz
daz
-tId
-wJB
-tJN
+czG
+ylg
+oIY
daz
daz
daz
diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
index 36c8e9abe717..917759783a2a 100644
--- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
+++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
@@ -2220,9 +2220,6 @@
icon_state = "floor_plate"
},
/area/whiskey_outpost/inside/living)
-"hP" = (
-/turf/open/space/basic,
-/area/whiskey_outpost/inside/caves)
"hQ" = (
/turf/open/floor/prison{
icon_state = "floor_plate"
@@ -22778,7 +22775,7 @@ mT
mT
mT
mT
-hP
+mT
mT
mT
dl
@@ -23177,12 +23174,12 @@ mT
mT
mT
mT
-hP
mT
mT
mT
mT
-hP
+mT
+mT
mT
mT
qz
diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json
index 61c3a7fd3f69..5a0f6d67c410 100644
--- a/maps/sorokyne_strata.json
+++ b/maps/sorokyne_strata.json
@@ -11,6 +11,7 @@
"/datum/equipment_preset/survivor/scientist/soro",
"/datum/equipment_preset/survivor/doctor/soro",
"/datum/equipment_preset/survivor/engineer/soro",
+ "/datum/equipment_preset/survivor/corporate/soro",
"/datum/equipment_preset/survivor/security/soro",
"/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro"
],
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
index 835a94341708..b4e59f32c121 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -956,10 +956,6 @@ em {
color: #844300;
}
-.sentryradio {
- color: #844300;
-}
-
.medradio {
color: #008160;
}
diff --git a/tgui/packages/tgui/constants.js b/tgui/packages/tgui/constants.js
index 3d7530e7ead8..0ec51380a322 100644
--- a/tgui/packages/tgui/constants.js
+++ b/tgui/packages/tgui/constants.js
@@ -80,153 +80,233 @@ export const CSS_COLORS = [
export const RADIO_CHANNELS = [
{
name: 'Yautja',
- freq: 1214,
+ freq: 1205,
color: '#1ecc43',
},
{
- name: 'PMC',
- freq: 1235,
+ name: "Dutch's Dozen",
+ freq: 1210,
color: '#1ecc43',
},
+ {
+ name: 'VAI',
+ freq: 1215,
+ color: '#e3580e',
+ },
+ {
+ name: 'CMB',
+ freq: 1220,
+ color: '#1b748c',
+ },
{
name: 'WY',
- freq: 1236,
- color: '#1ecc43',
+ freq: 1231,
+ color: '#fe9b24',
},
{
- name: "Dutch's Dozen",
- freq: 1340,
- color: '#1ecc43',
+ name: 'PMC CMD',
+ freq: 1232,
+ color: '#4dc5ce',
},
{
- name: 'VAI',
- freq: 1218,
- color: '#1ecc43',
+ name: 'PMC',
+ freq: 1233,
+ color: '#4dc5ce',
},
{
- name: 'ERT',
- freq: 1342,
- color: '#1ecc43',
+ name: 'PMC ENG',
+ freq: 1234,
+ color: '#4dc5ce',
+ },
+ {
+ name: 'PMC MED',
+ freq: 1235,
+ color: '#4dc5ce',
+ },
+ {
+ name: 'PMC CCT',
+ freq: 1236,
+ color: '#4dc5ce',
+ },
+ {
+ name: 'Deathsquad',
+ freq: 1239,
+ color: '#fe9b24',
},
{
name: 'UPP',
- freq: 1338,
- color: '#1ecc43',
+ freq: 1251,
+ color: '#8f4a4b',
+ },
+ {
+ name: 'UPP CMD',
+ freq: 1252,
+ color: '#8f4a4b',
+ },
+ {
+ name: 'UPP ENG',
+ freq: 1253,
+ color: '#8f4a4b',
+ },
+ {
+ name: 'UPP MED',
+ freq: 1254,
+ color: '#8f4a4b',
+ },
+ {
+ name: 'UPP CCT',
+ freq: 1255,
+ color: '#8f4a4b',
+ },
+ {
+ name: 'UPP KDO',
+ freq: 1259,
+ color: '#8f4a4b',
},
{
name: 'CLF',
- freq: 1339,
- color: '#1ecc43',
+ freq: 1271,
+ color: '#8e83ca',
},
{
- name: 'Deathsquad',
- freq: 1344,
+ name: 'CLF CMD',
+ freq: 1272,
+ color: '#8e83ca',
+ },
+ {
+ name: 'CLF ENG',
+ freq: 1273,
+ color: '#8e83ca',
+ },
+ {
+ name: 'CLF MED',
+ freq: 1274,
+ color: '#8e83ca',
+ },
+ {
+ name: 'CLF CCT',
+ freq: 1275,
+ color: '#8e83ca',
+ },
+ {
+ name: 'LSTN BUG A',
+ freq: 1290,
+ color: '#d65d95',
+ },
+ {
+ name: 'LSTN BUG B',
+ freq: 1291,
+ color: '#d65d95',
+ },
+ {
+ name: 'Common',
+ freq: 1461,
color: '#1ecc43',
},
{
- name: 'ARES',
- freq: 1447,
+ name: 'Colony',
+ freq: 1469,
color: '#1ecc43',
},
{
name: 'High Command',
- freq: 1240,
- color: '#1ecc43',
+ freq: 1471,
+ color: '#318779',
},
{
- name: 'CCT',
- freq: 1350,
- color: '#1ecc43',
+ name: 'SOF',
+ freq: 1472,
+ color: '#318779',
+ },
+ {
+ name: 'Provost',
+ freq: 1473,
+ color: '#9b0612',
+ },
+ {
+ name: 'Sentry',
+ freq: 1480,
+ color: '#844300',
},
{
name: 'Command',
- freq: 1353,
- color: '#1ecc43',
+ freq: 1481,
+ color: '#779cc2',
},
{
name: 'Medsci',
- freq: 1355,
- color: '#1ecc43',
+ freq: 1482,
+ color: '#008160',
},
{
name: 'Engineering',
- freq: 1357,
- color: '#1ecc43',
+ freq: 1483,
+ color: '#a66300',
},
{
name: 'MP',
- freq: 1359,
- color: '#1ecc43',
+ freq: 1484,
+ color: '#a52929',
},
{
name: 'Req',
- freq: 1354,
- color: '#1ecc43',
+ freq: 1485,
+ color: '#ba8e41',
},
{
name: 'JTAC',
- freq: 1358,
- color: '#1ecc43',
+ freq: 1486,
+ color: '#ad3b98',
},
{
name: 'Intel',
- freq: 1356,
- color: '#1ecc43',
+ freq: 1487,
+ color: '#027d02',
},
{
name: 'Alamo',
- freq: 1441,
+ freq: 1488,
color: '#1ecc43',
},
{
name: 'Normandy',
- freq: 1443,
+ freq: 1489,
color: '#1ecc43',
},
{
name: 'Alpha',
- freq: 1449,
- color: '#1ecc43',
+ freq: 1491,
+ color: '#db2626',
},
{
name: 'Bravo',
- freq: 1451,
- color: '#1ecc43',
- },
- {
- name: 'Common',
- freq: 1461,
- color: '#1ecc43',
+ freq: 1492,
+ color: '#c68610',
},
{
- name: 'Colony',
- freq: 1469,
- color: '#1ecc43',
- },
- {
- name: 'MARSOC',
- freq: 1241,
- color: '#1ecc43',
+ name: 'Charlie',
+ freq: 1493,
+ color: '#aa55aa',
},
{
- name: 'Reserves',
- freq: 1457,
- color: '#1ecc43',
+ name: 'Delta',
+ freq: 1494,
+ color: '#007fcf',
},
{
name: 'Echo',
- freq: 1456,
- color: '#1ecc43',
+ freq: 1495,
+ color: '#3eb489',
},
{
- name: 'Delta',
- freq: 1455,
- color: '#1ecc43',
+ name: 'Reserves',
+ freq: 1496,
+ color: '#ad6d48',
},
{
- name: 'Charlie',
- freq: 1453,
- color: '#1ecc43',
+ name: 'ARES',
+ freq: 1500,
+ color: '#ff00ff',
},
];
diff --git a/tgui/packages/tgui/interfaces/Orbit/helpers.ts b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
index a43aaf1ff0b0..9facaf339b29 100644
--- a/tgui/packages/tgui/interfaces/Orbit/helpers.ts
+++ b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
@@ -31,7 +31,9 @@ export const getDisplayName = (full_name: string, nickname?: string) => {
};
/** Returns the display color for certain health percentages */
-export const getHealthColor = (health: number) => {
+export const getHealthColor = (health?: number) => {
+ if (!health) return 'bad';
+
switch (true) {
case health > HEALTH.Good:
return 'good';
diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx
index e9e345995271..83dfe3b361b2 100644
--- a/tgui/packages/tgui/interfaces/Orbit/index.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx
@@ -215,6 +215,8 @@ const ObservableItem = (
const [autoObserve] = useLocalState(context, 'autoObserve', false);
+ const displayHealth = typeof health === 'number';
+
return (