diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
index de1166543f..b205feae99 100644
--- a/ATTRIBUTIONS.md
+++ b/ATTRIBUTIONS.md
@@ -37,3 +37,10 @@
**License:** [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/)
**URL:** [Forum Thread](http://fractalsoftworks.com/forum/index.php?topic=14935.0)
**Notes:** Permission to use assets also given in writing.
+
+**File:** `icons/mecha/fighters64x64.dmi`
+**Icon-States:** `gunpod`, derivs by VerySoft.
+**Creator:** Tartiflette & FlashFrozen
+**License:** [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** [Patreon Post](https://www.patreon.com/posts/diable-avionics-44573931)
+**Notes:** Permission to use assets also given in writing.
diff --git a/code/__defines/color.dm b/code/__defines/color.dm
index 3674512813..ecf01528aa 100644
--- a/code/__defines/color.dm
+++ b/code/__defines/color.dm
@@ -91,6 +91,7 @@
#define COLOR_DARK_TEAL "#2db5b5"
#define COLOR_LIGHT_VIOLET "#e7bfff"
#define COLOR_SAN_MARINO_BLUE "#4b75ab"
+#define COLOR_OLIVE "#52613b" //VOREStation Addition
#define PIPE_COLOR_GREY "#808080"
#define PIPE_COLOR_RED "#ff0000"
diff --git a/code/game/machinery/computer/arcade_vr.dm b/code/game/machinery/computer/arcade_vr.dm
index 86669259a1..f5c23ead0d 100644
--- a/code/game/machinery/computer/arcade_vr.dm
+++ b/code/game/machinery/computer/arcade_vr.dm
@@ -1,5 +1,5 @@
/obj/machinery/computer/arcade
- list/prizes = list( /obj/item/weapon/storage/box/snappops = 2,
+ prizes = list( /obj/item/weapon/storage/box/snappops = 2,
/obj/item/toy/blink = 2,
/obj/item/clothing/under/syndicate/tacticool = 2,
/obj/item/toy/sword = 2,
diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm
index 599fd9d522..2bdd52bfa9 100644
--- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm
+++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm
@@ -145,7 +145,7 @@
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red")
/obj/item/weapon/card/id/civilian/pilot
- initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-darkgreen")
+ initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive")
/obj/item/weapon/card/id/civilian/entertainer
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown")
@@ -179,13 +179,13 @@
//Exploration
/obj/item/weapon/card/id/exploration
- initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n")
+ initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n")
/obj/item/weapon/card/id/exploration/fm
- initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n", "stripe-medblu")
+ initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu")
/obj/item/weapon/card/id/exploration/head
- initial_sprite_stack = list("base-stamp-silver", "top-darkgreen", "stamp-n", "pips-white")
+ initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white")
//Talon
diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm
index 4d40578c1e..e332ed40f7 100644
--- a/code/game/objects/random/mapping.dm
+++ b/code/game/objects/random/mapping.dm
@@ -464,6 +464,18 @@
/obj/random/multiple/ore_pile/item_to_spawn()
return pick(
+ prob(10);list(
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite,
+ /obj/item/weapon/ore/bauxite
+ ),
prob(10);list(
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
@@ -476,6 +488,18 @@
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal
),
+ prob(10);list(
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper,
+ /obj/item/weapon/ore/copper
+ ),
prob(3);list(
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
@@ -552,6 +576,13 @@
/obj/item/weapon/ore/phoron,
/obj/item/weapon/ore/phoron
),
+ prob(5);list(
+ /obj/item/weapon/ore/rutile,
+ /obj/item/weapon/ore/rutile,
+ /obj/item/weapon/ore/rutile,
+ /obj/item/weapon/ore/rutile,
+ /obj/item/weapon/ore/rutile
+ ),
prob(5);list(
/obj/item/weapon/ore/silver,
/obj/item/weapon/ore/silver,
@@ -568,6 +599,10 @@
/obj/item/weapon/ore/verdantium,
/obj/item/weapon/ore/verdantium
),
+ prob(2);list(
+ /obj/item/weapon/ore/void_opal,
+ /obj/item/weapon/ore/void_opal
+ ),
)
/obj/random/multiple/corp_crate
@@ -849,6 +884,13 @@
/obj/random/grenade,
/obj/structure/closet/crate/secure/saare //SAARE GRENADES
),
+ prob(1);list(
+ /obj/random/material/precious,
+ /obj/random/material/precious,
+ /obj/random/material/precious,
+ /obj/random/material/precious,
+ /obj/structure/closet/crate/secure/saare //SAARE BULLION CRATE
+ ),
prob(1);list(
/obj/random/cash/big,
/obj/random/cash/big,
@@ -1093,6 +1135,13 @@
/obj/item/weapon/tank/phoron/pressurized,
/obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS
),
+ prob(1);list(
+ /obj/random/material/precious,
+ /obj/random/material/precious,
+ /obj/random/material/precious,
+ /obj/random/material/precious,
+ /obj/structure/closet/crate/secure/saare //SAARE BULLION CRATE
+ ),
prob(1);list(
/obj/random/cash/big,
/obj/random/cash/big,
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index de41a801ec..68ca1c2a2c 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -498,8 +498,11 @@
/obj/item/stack/material/glass/reinforced{amount = 10},
/obj/item/stack/material/plastic{amount = 10},
/obj/item/stack/material/wood{amount = 10},
+ /obj/item/stack/material/wood/sif{amount = 10},
/obj/item/stack/material/cardboard{amount = 10},
/obj/item/stack/rods{amount = 10},
+ /obj/item/stack/material/sandstone{amount = 10},
+ /obj/item/stack/material/marble{amount = 10},
/obj/item/stack/material/plasteel{amount = 10})
/obj/random/material/refined //Random materials for building stuff
@@ -518,6 +521,8 @@
/obj/item/stack/material/durasteel{amount = 5},
/obj/item/stack/material/gold{amount = 5},
/obj/item/stack/material/iron{amount = 10},
+ /obj/item/stack/material/copper{amount = 10},
+ /obj/item/stack/material/aluminium{amount = 10},
/obj/item/stack/material/lead{amount = 10},
/obj/item/stack/material/diamond{amount = 3},
/obj/item/stack/material/deuterium{amount = 5},
@@ -531,6 +536,19 @@
/obj/item/stack/material/tritium{amount = 3},
/obj/item/stack/material/verdantium{amount = 2})
+/obj/random/material/precious //Precious metals, go figure
+ name = "random precious metal"
+ desc = "This is a small stack of a random precious metal."
+ icon = 'icons/obj/stacks.dmi'
+ icon_state = "sheet-gold_2"
+
+/obj/random/material/precious/item_to_spawn()
+ return pick(/obj/item/stack/material/gold{amount = 5},
+ /obj/item/stack/material/copper{amount = 5},
+ /obj/item/stack/material/silver{amount = 5},
+ /obj/item/stack/material/platinum{amount = 5},
+ /obj/item/stack/material/osmium{amount = 5})
+
/obj/random/tank
name = "random tank"
desc = "This is a tank."
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
index 419b28e9c1..4676095242 100644
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
@@ -65,7 +65,7 @@
)
/decl/closet_appearance/secure_closet/expedition
- color = COLOR_BRASS
+ color = COLOR_OLIVE
decals = list(
"lower_side_vent"
)
@@ -84,15 +84,13 @@
/decl/closet_appearance/secure_closet/expedition/explorer
extra_decals = list(
- "stripe_vertical_left_full" = COLOR_PURPLE,
- "stripe_vertical_right_full" = COLOR_PURPLE,
- "exped" = COLOR_PURPLE
+ "stripe_vertical_mid_full" = COLOR_GRAY40,
+ "exped" = COLOR_GRAY40
)
/decl/closet_appearance/secure_closet/expedition/pathfinder
extra_decals = list(
- "stripe_vertical_left_full" = COLOR_PURPLE,
- "stripe_vertical_mid_full" = COLOR_GRAY40,
- "stripe_vertical_right_full" = COLOR_PURPLE,
- "exped" = COLOR_GRAY40
+ "stripe_vertical_left_full" = COLOR_GRAY20,
+ "stripe_vertical_right_full" = COLOR_GRAY20,
+ "exped" = COLOR_GRAY20
)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
index 6be3942fd7..be66fb2f35 100644
--- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
@@ -124,7 +124,7 @@
/obj/item/weapon/storage/backpack/parachute,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/gun/energy/locked/frontier/holdout,
- /obj/item/clothing/head/ompilot,
+ /obj/item/clothing/head/pilot_vr,
/obj/item/clothing/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
/obj/item/clothing/shoes/boots/winter/explorer,
diff --git a/code/modules/ai/ai_holder_combat_unseen.dm b/code/modules/ai/ai_holder_combat_unseen.dm
index c854377c89..5c29f8a31b 100644
--- a/code/modules/ai/ai_holder_combat_unseen.dm
+++ b/code/modules/ai/ai_holder_combat_unseen.dm
@@ -7,27 +7,30 @@
if(conserve_ammo || !holder.ICheckRangedAttack(target_last_seen_turf))
if(get_dist(holder, target_last_seen_turf) > 1) // We last saw them over there.
// Go to where you last saw the enemy.
- give_destination(target_last_seen_turf, 1, TRUE) // Sets stance as well
- else if(lose_target_time == world.time) // We last saw them next to us, so do a blind attack on that tile.
- melee_on_tile(target_last_seen_turf)
+ return give_destination(target_last_seen_turf, 1, TRUE) // Sets stance as well
+ else if(lose_target_time < world.time) // We last saw them next to us, so do a blind attack on that tile.
+ if(melee_on_tile(target_last_seen_turf) != ATTACK_SUCCESSFUL && intelligence_level >= AI_NORMAL)
+ var/obj/O = find_escape_route()
+ if(istype(O))
+ return give_destination(get_turf(O), 0, TRUE)
else
- find_target()
+ return find_target()
else
- shoot_near_turf(target_last_seen_turf)
+ return shoot_near_turf(target_last_seen_turf)
// This shoots semi-randomly near a specific turf.
/datum/ai_holder/proc/shoot_near_turf(turf/targeted_turf)
if(get_dist(holder, targeted_turf) > max_range(targeted_turf))
- return // Too far to shoot.
+ return ATTACK_FAILED// Too far to shoot.
var/turf/T = pick(RANGE_TURFS(2, targeted_turf)) // The turf we're actually gonna shoot at.
on_engagement(T)
if(firing_lanes && !test_projectile_safety(T))
step_rand(holder)
holder.face_atom(T)
- return
+ return ATTACK_FAILED
- ranged_attack(T)
+ return ranged_attack(T)
// Attempts to attack something on a specific tile.
// TODO: Put on mob/living?
@@ -36,9 +39,53 @@
var/mob/living/L = locate() in T
if(!L)
T.visible_message("\The [holder] attacks nothing around \the [T].")
- return
+ return ATTACK_FAILED
if(holder.IIsAlly(L)) // Don't hurt our ally.
- return
+ return ATTACK_FAILED
- melee_attack(L)
\ No newline at end of file
+ return melee_attack(L)
+
+// Attempts to locate any possible avenues that the target might have escaped via
+// Could be an open door, could be a stairwell or a ladder
+// Returns object to path to. If multiple targets are equidistant, picks randomly
+/datum/ai_holder/proc/find_escape_route()
+ ai_log("find_escape_route() : Entering.", AI_LOG_DEBUG)
+ var/list/closest_escape = list()
+ var/closest_dist = world.view // We can't see any further than this
+ var/list/possible_escape_types = list(
+ /obj/machinery/door,
+ /obj/structure/stairs/top,
+ /obj/structure/stairs/bottom
+ )
+
+ if(intelligence_level >= AI_SMART)
+ possible_escape_types += /obj/structure/ladder
+
+ for(var/atom/A in view(world.view, holder))
+ if(!is_type_in_list(A, possible_escape_types))
+ continue // Not something they could have escaped through
+ if(turn(holder.dir, 180) & get_dir(get_turf(holder), get_turf(A)))
+ continue // Surely, they couldn't have escaped *behind* us!
+
+ if(istype(A, /obj/machinery/door))
+ var/obj/machinery/door/D = A
+ if(D.glass) // Surely, they couldn't hide behind a transparent door!
+ continue
+ if(D.density && intelligence_level < AI_SMART) // Surely, they couldn't have escaped through a *closed* door
+ continue
+
+ var/dist = get_dist(holder, A)
+ if(dist == closest_dist)
+ closest_escape += A
+
+ else if(dist < closest_dist)
+ closest_escape.Cut()
+ closest_escape += A
+ closest_dist = dist
+ ai_log("find_escape_route() : Found [closest_escape.len] candidates [closest_dist] tiles away.", AI_LOG_DEBUG)
+ if(closest_escape.len)
+ return pick(closest_escape)
+ return null
+
+
\ No newline at end of file
diff --git a/code/modules/ai/ai_holder_movement.dm b/code/modules/ai/ai_holder_movement.dm
index 3f9eb1b685..bc5916917a 100644
--- a/code/modules/ai/ai_holder_movement.dm
+++ b/code/modules/ai/ai_holder_movement.dm
@@ -27,19 +27,19 @@
ai_log("walk_to_destination() : Exiting.", AI_LOG_TRACE)
return
- var/get_to = min_distance_to_destination
var/distance = get_dist(holder, destination)
- ai_log("walk_to_destination() : get_to is [get_to].", AI_LOG_TRACE)
+ ai_log("walk_to_destination() : get_to is [min_distance_to_destination].", AI_LOG_TRACE)
- // We're here!
- if(distance <= get_to)
+ // We're here! Or we're horribly lost
+ if(distance <= min_distance_to_destination || holder.z != destination.z)
+ check_use_ladder()
give_up_movement()
set_stance(stance == STANCE_REPOSITION ? STANCE_APPROACH : STANCE_IDLE)
ai_log("walk_to_destination() : Destination reached. Exiting.", AI_LOG_INFO)
return
ai_log("walk_to_destination() : Walking.", AI_LOG_TRACE)
- walk_path(destination, get_to)
+ walk_path(destination, min_distance_to_destination)
ai_log("walk_to_destination() : Exiting.",AI_LOG_TRACE)
/datum/ai_holder/proc/should_go_home()
@@ -159,3 +159,34 @@
holder.IMove(get_step(holder,moving_to))
wander_delay = base_wander_delay
ai_log("handle_wander_movement() : Exited.", AI_LOG_TRACE)
+
+/datum/ai_holder/proc/check_use_ladder()
+ // No target, don't use the ladder
+ // Target is visible, don't use the ladder
+ if(!target || can_see_target(target))
+ return
+
+ var/has_hands = TRUE
+ if(istype(holder, /mob/living/simple_mob))
+ var/mob/living/simple_mob/S = holder
+ has_hands = S.has_hands
+
+ // Don't have means to use a ladder or the space around it, don't use the ladder
+ if(!has_hands && !holder.hovering)
+ return
+
+ var/obj/structure/ladder/L = locate() in get_turf(holder)
+ if(!istype(L))
+ return // No ladder, can't use it
+
+ if(!holder.may_climb_ladders(L))
+ return // Can't climb the ladder for other reasons (Probably inconsequential?)
+
+ var/list/directions = list()
+ if(L.allowed_directions & DOWN)
+ directions += L.target_down
+ if(L.allowed_directions & UP)
+ directions += L.target_up
+
+ if(directions.len)
+ L.climbLadder(holder, pick(directions))
\ No newline at end of file
diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm
index 240d782926..3647c53cc5 100644
--- a/code/modules/ai/ai_holder_targeting.dm
+++ b/code/modules/ai/ai_holder_targeting.dm
@@ -165,19 +165,14 @@
target = null
lose_target_time = world.time
- give_up_movement()
-
- if(target_last_seen_turf && intelligence_level >= AI_SMART)
+ if(target_last_seen_turf && intelligence_level >= AI_NORMAL)
ai_log("lose_target() : Going into 'engage unseen enemy' mode.", AI_LOG_INFO)
- engage_unseen_enemy()
- return TRUE //We're still working on it
+ return engage_unseen_enemy() //We're still working on it
else
ai_log("lose_target() : Can't chase target, so giving up.", AI_LOG_INFO)
remove_target()
return find_target() //Returns if we found anything else to do
- return FALSE //Nothing new to do
-
// 'Hard' loss of target. Clean things up and return to idle.
/datum/ai_holder/proc/remove_target()
ai_log("remove_target() : Entering.", AI_LOG_TRACE)
diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
index 56c850c50e..f7fdf0f5b8 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
@@ -50,7 +50,7 @@
/datum/gear/accessory/holster
display_name = "holster selection (Security, SM, HoP, Exploration)"
- allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS
+ allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard","Blueshield Guard","Security Pilot") //YW ADDITIONS)
/datum/gear/accessory/brown_vest
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
index 3d1b925454..9504678e06 100644
--- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
@@ -2,7 +2,7 @@
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/eyes/meson
- display_name = "Optical Meson Scanners (Engineering, Science)"
+ display_name = "Optical Meson Scanners (Eng, Sci, Explo)"
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder")
/datum/gear/eyes/arglasses
@@ -55,7 +55,7 @@
path = /obj/item/clothing/glasses/fluff/science_proper
/datum/gear/eyes/meson/retinal
- display_name = "retinal projector, meson (Eng, Sci, Mining)"
+ display_name = "retinal projector, meson (Eng, Sci, Explo)"
path = /obj/item/clothing/glasses/omnihud/eng/meson
/datum/gear/eyes/security/secpatch
diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
index 2aebfd668f..d7add786c5 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
@@ -1,3 +1,8 @@
+/datum/gear/head/cap/med
+ display_name = "cap, medical (Medical)"
+ path = /obj/item/clothing/head/soft/med
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic")
+
/*/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol*/
diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
index 554300d379..66e93fbbf6 100644
--- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
@@ -1,6 +1,3 @@
-/datum/gear/shoes/boots/winter/science
- allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
/datum/gear/shoes/boots/winter/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index aaa47d1b72..6e090c90ae 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -340,6 +340,8 @@ datum/gear/suit/duster
path = /obj/item/clothing/suit/storage/forensics/red
allowed_roles = list("Detective")
+// winter coats go here
+
/datum/gear/suit/wintercoat
display_name = "winter coat"
path = /obj/item/clothing/suit/storage/hooded/wintercoat
@@ -349,38 +351,134 @@ datum/gear/suit/duster
path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
allowed_roles = list("Site Manager")
+/datum/gear/suit/wintercoat/hop
+ display_name = "winter coat, head of personnel"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/hop
+ allowed_roles = list("Head of Personnel")
+
/datum/gear/suit/wintercoat/security
display_name = "winter coat, security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
+/datum/gear/suit/wintercoat/security/hos
+ display_name = "winter coat, head of security"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos
+ allowed_roles = list("Head of Security")
+
/datum/gear/suit/wintercoat/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
+ allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/wintercoat/medical/alt
+ display_name = "winter coat, medical alt"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt
+ allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/wintercoat/medical/viro
+ display_name = "winter coat, virologist"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro
+ allowed_roles = list("Medical Doctor","Chief Medical Officer")
+
+/datum/gear/suit/wintercoat/medical/para
+ display_name = "winter coat, paramedic"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para
+ allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
+
+/datum/gear/suit/wintercoat/medical/chemist
+ display_name = "winter coat, chemist"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist
+ allowed_roles = list("Chief Medical Officer","Chemist")
+
+/datum/gear/suit/wintercoat/medical/cmo
+ display_name = "winter coat, chief medical officer"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo
+ allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/suit/wintercoat/medical/sar
+ display_name = "winter coat, search and rescue"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
+ allowed_roles = list("Chief Medical Officer", "Field Medic")
/datum/gear/suit/wintercoat/science
display_name = "winter coat, science"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
+ allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
+
+
+/datum/gear/suit/wintercoat/science/robotics
+ display_name = "winter coat, robotics"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
+ allowed_roles = list("Research Director", "Roboticist")
+
+/datum/gear/suit/wintercoat/science/rd
+ display_name = "winter coat, research director"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd
+ allowed_roles = list("Research Director")
/datum/gear/suit/wintercoat/engineering
display_name = "winter coat, engineering"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
+ allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
-/datum/gear/suit/wintercoat/atmos
+/datum/gear/suit/wintercoat/engineering/atmos
display_name = "winter coat, atmospherics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
+ allowed_roles = list("Chief Engineer", "Atmospheric Technician")
+
+/datum/gear/suit/wintercoat/engineering/ce
+ display_name = "winter coat, chief engineer"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce
+ allowed_roles = list("Chief Engineer")
/datum/gear/suit/wintercoat/hydro
display_name = "winter coat, hydroponics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
+ allowed_roles = list("Botanist", "Xenobotanist")
/datum/gear/suit/wintercoat/cargo
display_name = "winter coat, cargo"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
+ allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/suit/wintercoat/miner
display_name = "winter coat, mining"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
+ allowed_roles = list("Shaft Miner")
+
+/datum/gear/suit/wintercoat/cargo/qm
+ display_name = "winter coat, quartermaster"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm
+ allowed_roles = list("Quartermaster")
+
+/datum/gear/suit/wintercoat/bar
+ display_name = "winter coat, bartender"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/bar
+ allowed_roles = list("Bartender")
+
+/datum/gear/suit/wintercoat/janitor
+ display_name = "winter coat, janitor"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/janitor
+ allowed_roles = list("Janitor")
+
+/datum/gear/suit/wintercoat/aformal
+ display_name = "winter coat, assistant formal"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/aformal
+
+/datum/gear/suit/wintercoat/ratvar
+ display_name = "winter coat, brassy"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/ratvar
+
+/datum/gear/suit/wintercoat/narsie
+ display_name = "winter coat, runed"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/narsie
+
+/datum/gear/suit/wintercoat/cosmic
+ display_name = "winter coat, cosmic"
+ path = /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
+
+// winter coats end here
/datum/gear/suit/varsity
display_name = "varsity jacket selection"
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index a61b2f7e0a..25dc8d4511 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -1,15 +1,6 @@
-/datum/gear/suit/wintercoat/medical
- allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
-
-/datum/gear/suit/wintercoat/science
- allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
/datum/gear/suit/snowsuit/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
-/datum/gear/suit/snowsuit/science
- allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
/datum/gear/suit/labcoat_colorable
display_name = "labcoat, colorable"
path = /obj/item/clothing/suit/storage/toggle/labcoat
@@ -55,7 +46,7 @@
/datum/gear/suit/roles/medical/ems_jacket
display_name = "first responder jacket"
path = /obj/item/clothing/suit/storage/toggle/fr_jacket
- allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
+ allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic")
//imo-superior 'martian' style jacket with the star-of-life design
/datum/gear/suit/roles/medical/ems_jacket/alt
@@ -66,7 +57,7 @@
/datum/gear/suit/roles/medical/paramedic_vest
display_name = "paramedic vest"
path = /obj/item/clothing/suit/storage/toggle/paramedic
- allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
+ allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic")
//greek thing
/datum/gear/suit/chiton
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
index 73c2e8e320..4f811c217e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
@@ -13,6 +13,10 @@
/datum/gear/uniform/job_turtle/science
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
+/datum/gear/uniform/job_turtle/medical
+ display_name = "turtleneck, medical"
+ path = /obj/item/clothing/under/rank/medical/turtleneck
+ allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Field Medic", "Chemist")
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
@@ -38,7 +42,7 @@
/datum/gear/uniform/job_khi/sci
display_name = "khi uniform, sci"
path = /obj/item/clothing/under/rank/khi/sci
- allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer")
+ allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_khi/crg
display_name = "khi uniform, cargo"
@@ -58,7 +62,7 @@
/datum/gear/suit/job_fed/medsci
display_name = "fed uniform, med/sci"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Pathfinder","Explorer","Field Medic")
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Field Medic")
/datum/gear/suit/job_fed/eng
display_name = "fed uniform, eng"
@@ -75,7 +79,7 @@
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng/sec"
@@ -91,7 +95,7 @@
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/next
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng/sec"
@@ -107,7 +111,7 @@
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/voy
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng/sec"
@@ -133,7 +137,7 @@
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ds9
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng/sec"
@@ -150,7 +154,7 @@
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ent
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng/sec"
diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
index 8fd7fa081d..271a9a4658 100644
--- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
@@ -54,7 +54,7 @@
/datum/gear/utility/dufflebag/sci
display_name = "science dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/sci
- allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist","Explorer","Pathfinder")
+ allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist")
/datum/gear/utility/ID
display_name = "contractor identification card"
diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm
index 5ac04810ea..1fb1394bce 100644
--- a/code/modules/clothing/head/hood.dm
+++ b/code/modules/clothing/head/hood.dm
@@ -10,42 +10,159 @@
/obj/item/clothing/head/hood/winter
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
- icon_state = "generic_hood"
+ icon_state = "winterhood"
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
/obj/item/clothing/head/hood/winter/captain
name = "site manager's winter hood"
+ desc = "A blue and yellow hood attached to a heavy winter jacket."
+ icon_state = "winterhood_captain"
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
+/obj/item/clothing/head/hood/winter/hop
+ name = "head of personnel's winter hood"
+ desc = "A cozy winter hood attached to a heavy winter jacket."
+ icon_state = "winterhood_hop"
+
/obj/item/clothing/head/hood/winter/security
name = "security winter hood"
+ desc = "A red, armor-padded winter hood."
+ icon_state = "winterhood_security"
+ armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
+
+/obj/item/clothing/head/hood/winter/security/hos
+ name = "head of security's winter hood"
+ desc = "A red, armor-padded winter hood, lovingly woven with a Kevlar interleave. Definitely not bulletproof, especially not the part where your face goes."
+ icon_state = "winterhood_hos"
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/head/hood/winter/medical
name = "medical winter hood"
+ desc = "A white winter coat hood."
+ icon_state = "winterhood_medical"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+
+/obj/item/clothing/head/hood/winter/medical/alt
+ name = "medical winter hood, alt"
+ desc = "A white winter coat hood. It's warm."
+ icon_state = "winterhood_medicalalt"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+
+/obj/item/clothing/head/hood/winter/medical/viro
+ name = "virologist winter hood"
+ desc = "A white winter coat hood with green markings."
+ icon_state = "winterhood_viro"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+
+/obj/item/clothing/head/hood/winter/medical/para
+ name = "paramedic winter hood"
+ desc = "A white winter coat hood with blue markings."
+ icon_state = "winterhood_para"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+
+/obj/item/clothing/head/hood/winter/medical/chemist
+ name = "chemist winter hood"
+ desc = "A white winter coat hood."
+ icon_state = "winterhood_chemist"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+
+/obj/item/clothing/head/hood/winter/medical/cmo
+ name = "chief medical officer's winter hood"
+ desc = "A white winter coat hood."
+ icon_state = "winterhood_cmo"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
/obj/item/clothing/head/hood/winter/science
name = "science winter hood"
+ desc = "A white winter coat hood. This one will keep your brain warm. About as much as the others, really."
+ icon_state = "winterhood_science"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+/obj/item/clothing/head/hood/winter/science/robotics
+ name = "science winter hood"
+ desc = "A black winter coat hood. You can pull it down over your eyes and pretend that you're an outdated, late 1980s interpretation of a futuristic mechanized police force. They'll fix you. They fix everything."
+ icon_state = "winterhood_robotics"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+
+/obj/item/clothing/head/hood/winter/science/rd
+ name = "research director's winter hood"
+ desc = "A white winter coat hood. It smells faintly of slightly unethical ideas."
+ icon_state = "winterhood_rd"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+
+
/obj/item/clothing/head/hood/winter/engineering
name = "engineering winter hood"
+ desc = "A yellow winter coat hood. Definitely not a replacement for a hard hat."
+ icon_state = "winterhood_engineer"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
/obj/item/clothing/head/hood/winter/engineering/atmos
name = "atmospherics winter hood"
+ desc = "A yellow and blue winter coat hood."
+ icon_state = "winterhood_atmos"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
+
+/obj/item/clothing/head/hood/winter/engineering/ce
+ name = "chief engineer's winter hood"
+ desc = "A white winter coat hood. Feels surprisingly heavy. The tag says that it's not child safe."
+ icon_state = "winterhood_ce"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
/obj/item/clothing/head/hood/winter/hydro
name = "hydroponics winter hood"
+ desc = "A green winter coat hood."
+ icon_state = "winterhood_hydro"
/obj/item/clothing/head/hood/winter/cargo
name = "cargo winter hood"
+ desc = "A grey hood for a winter coat."
+ icon_state = "winterhood_cargo"
-/obj/item/clothing/head/hood/winter/miner
+/obj/item/clothing/head/hood/winter/cargo/miner
name = "mining winter hood"
+ desc = "A dusty winter coat hood."
+ icon_state = "winterhood_miner"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+/obj/item/clothing/head/hood/winter/cargo/qm
+ name = "quartermaster's winter hood"
+ desc = "A dark brown winter coat hood."
+ icon_state = "winterhood_qm"
+
+/obj/item/clothing/head/hood/winter/bar
+ name = "bartender winter hood"
+ desc = "A white winter coat hood."
+ icon_state = "winterhood_bar"
+
+/obj/item/clothing/head/hood/winter/janitor
+ name = "janitor winter hood"
+ desc = "A purple hood that smells of space cleaner."
+ icon_state = "winterhood_janitor"
+
+/obj/item/clothing/head/hood/winter/aformal
+ name = "assistant formal winter hood"
+ desc = "A black winter coat hood."
+ icon_state = "winterhood_aformal"
+
+/obj/item/clothing/head/hood/winter/ratvar
+ name = "brassy winter hood"
+ desc = "A brass-plated winter hood that glows softly, hinting at its divinity."
+ icon_state = "winterhood_ratvar"
+ light_range = 3
+ light_power = 1
+ light_color = "#B18B25" //clockwork slab background top color
+
+/obj/item/clothing/head/hood/winter/narsie
+ name = "runed winter hood"
+ desc = "A black winter hood full of whispering secrets that only She shall ever know."
+ icon_state = "winterhood_narsie"
+
+/obj/item/clothing/head/hood/winter/cosmic
+ name = "cosmic winter hood"
+ desc = "A starry winter hood."
+ icon_state = "winterhood_cosmic"
+
// Explorer gear
/obj/item/clothing/head/hood/explorer
name = "explorer hood"
diff --git a/code/modules/clothing/head/pilot_helmet_vr.dm b/code/modules/clothing/head/pilot_helmet_vr.dm
index acf700f81f..34f6c3293d 100644
--- a/code/modules/clothing/head/pilot_helmet_vr.dm
+++ b/code/modules/clothing/head/pilot_helmet_vr.dm
@@ -1,14 +1,9 @@
-//Overmap pilots. Same gear, without the dumb interface.
-
-/obj/item/clothing/head/ompilot
- name = "pilot helmet"
- desc = "Standard pilot gear. Protects the head from impacts."
- icon_state = "pilot_helmet1"
- item_icons = list(slot_head_str = 'icons/mob/pilot_helmet.dmi')
- sprite_sheets = list(
- SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi'
- )
- flags = THICKMATERIAL
+//Pilot helmets
+/obj/item/clothing/head/pilot_vr
+ name = "standard pilot helmet"
+ desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor"
+ icon = 'icons/obj/clothing/helmets_vr.dmi'
+ icon_state = "pilot1"
armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0)
flags_inv = HIDEEARS
cold_protection = HEAD
@@ -16,18 +11,36 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
w_class = ITEMSIZE_NORMAL
-
-/obj/item/clothing/head/ompilot/alt
- name = "pilot helmet"
- desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor"
- icon_state = "pilot_helmet2"
+ item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+ sprite_sheets = list(
+ SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+ )
action_button_name = "Toggle Visor"
-/obj/item/clothing/head/ompilot/alt/attack_self(mob/user as mob)
+/obj/item/clothing/head/pilot_vr/attack_self(mob/user as mob)
if(src.icon_state == initial(icon_state))
src.icon_state = "[icon_state]up"
to_chat(user, "You raise the visor on the pilot helmet.")
else
src.icon_state = initial(icon_state)
to_chat(user, "You lower the visor on the pilot helmet.")
- update_clothing_icon() //so our mob-overlays update
\ No newline at end of file
+ update_clothing_icon() //so our mob-overlays update
+
+/obj/item/clothing/head/pilot_vr/alt
+ name = "colored pilot helmet"
+ desc = "A colored version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
+ icon_state = "pilot2"
+ item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+ sprite_sheets = list(
+ SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+ )
+ action_button_name = "Toggle Visor"
+
+/obj/item/clothing/head/pilot_vr/alt/attack_self(mob/user as mob)
+ if(src.icon_state == initial(icon_state))
+ src.icon_state = "[icon_state]up"
+ to_chat(user, "You raise the visor on the pilot helmet.")
+ else
+ src.icon_state = initial(icon_state)
+ to_chat(user, "You lower the visor on the pilot helmet.")
+ update_clothing_icon() //so our mob-overlays update
diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm
index f1101ba453..550dfea0d0 100644
--- a/code/modules/clothing/suits/hooded.dm
+++ b/code/modules/clothing/suits/hooded.dm
@@ -85,6 +85,8 @@
action_button_name = "Toggle Ian Hood"
hoodtype = /obj/item/clothing/head/hood/ian_hood
+// winter coats go here
+
/obj/item/clothing/suit/storage/hooded/wintercoat
name = "winter coat"
desc = "A heavy jacket made from 'synthetic' animal furs."
@@ -94,97 +96,248 @@
flags_inv = HIDEHOLSTER
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit)
/obj/item/clothing/suit/storage/hooded/wintercoat/captain
name = "site manager's winter coat"
+ desc = "A heavy jacket made from the most expensive animal furs on the market and sewn with the finest of jewels. Truly a coat befitting a Manager."
icon_state = "coatcaptain"
item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain")
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/captain
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/gun/energy,
- /obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,
- /obj/item/weapon/handcuffs,/obj/item/clothing/head/helmet)
+ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,
+ /obj/item/weapon/handcuffs, /obj/item/clothing/head/helmet)
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/hop
+ name = "head of personnel's winter coat"
+ desc = "A cozy winter coat, covered in thick fur. The breast features a proud yellow chevron, reminding everyone that you're the second banana."
+ icon_state = "coathop"
+ armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 5, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/hop
+ allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/gun/energy,
+ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,
+ /obj/item/weapon/handcuffs, /obj/item/clothing/head/helmet)
/obj/item/clothing/suit/storage/hooded/wintercoat/security
name = "security winter coat"
+ desc = "A heavy jacket made from greyshirt hide. There seems to be a sewed in holster, as well as a thin weave of protection against most damage."
icon_state = "coatsecurity"
item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity")
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/security
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/gun/energy,
- /obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,
- /obj/item/weapon/handcuffs,/obj/item/clothing/head/helmet)
+ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,
+ /obj/item/weapon/handcuffs, /obj/item/clothing/head/helmet)
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos
+ name = "head of security's winter coat"
+ desc = "A heavy jacket made from greyshirt hide. There seems to be a sewed in holster, as well as a thin weave of protection against most damage."
+ icon_state = "coathos"
+ armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/security/hos
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/gun/energy,
+ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,
+ /obj/item/weapon/handcuffs, /obj/item/clothing/head/helmet)
/obj/item/clothing/suit/storage/hooded/wintercoat/medical
name = "medical winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. There's a thick weave of sterile material, good for virus outbreaks!"
icon_state = "coatmedical"
item_state_slots = list(slot_r_hand_str = "coatmedical", slot_l_hand_str = "coatmedical")
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/medical
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
- /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer,/obj/item/stack/medical,
- /obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,
- /obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,
- /obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle)
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer, /obj/item/stack/medical,
+ /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray,
+ /obj/item/device/healthanalyzer, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker,
+ /obj/item/weapon/reagent_containers/pill, /obj/item/weapon/storage/pill_bottle)
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt
+ name = "medical winter coat, alt"
+ desc = "A heavy jacket made from 'synthetic' animal furs. There's a thick weave of sterile material, good for virus outbreaks!"
+ icon_state = "coatmedicalalt"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/medical/alt
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro
+ name = "virologist winter coat"
+ desc = "A white winter coat with green markings. Warm, but wont fight off the common cold or any other disease. Might make people stand far away from you in the hallway. The zipper tab looks like an oversized bacteriophage."
+ icon_state = "coatviro"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/medical/viro
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para
+ name = "paramedic winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs.It has an aura of underappreciation."
+ icon_state = "coatpara"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/medical/para
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist
+ name = "chemist winter coat"
+ desc = "A lab-grade winter coat made with acid resistant polymers. For the enterprising chemist who was exiled to a frozen wasteland on the go."
+ icon_state = "coatchemist"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/medical/chemist
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo
+ name = "chief medical officer's winter coat"
+ desc = "A lab-grade winter coat made with acid resistant polymers. For the enterprising chemist who was exiled to a frozen wasteland on the go."
+ icon_state = "coatcmo"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/medical/cmo
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
+ name = "search and rescue winter coat"
+ desc = "A heavy winter jacket. A white star of life is emblazoned on the back, with the words search and rescue written underneath."
+ icon_state = "coatsar"
+ armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5)
+ hoodtype = /obj/item/clothing/head/hood/winter/medical
+ allowed = list (/obj/item/weapon/gun, /obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer, /obj/item/stack/medical,
+ /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray,
+ /obj/item/device/healthanalyzer, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker,
+ /obj/item/weapon/reagent_containers/pill, /obj/item/weapon/storage/pill_bottle)
/obj/item/clothing/suit/storage/hooded/wintercoat/science
name = "science winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. It has a small tag that says 'Bomb Proof! (Not fully bomb proof)'."
icon_state = "coatscience"
item_state_slots = list(slot_r_hand_str = "coatscience", slot_l_hand_str = "coatscience")
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/science
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer,/obj/item/stack/medical,
- /obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,
- /obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,
- /obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle)
+ /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray,
+ /obj/item/device/healthanalyzer, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker,
+ /obj/item/weapon/reagent_containers/pill, /obj/item/weapon/storage/pill_bottle)
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
+ name = "robotics winter coat"
+ desc = "A black winter coat with a badass flaming robotic skull for the zipper tab. This one has bright red designs and a few useless buttons."
+ icon_state = "coatrobotics"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/science/robotics
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/science/rd
+ name = "research director's winter coat"
+ desc = "A thick arctic winter coat with an outdated atomic model instead of a plastic zipper tab. Most in the know are heavily aware that Bohr's model of the atom was outdated by the time of the 1930s when the Heisenbergian and Schrodinger models were generally accepted for true. Nevertheless, we still see its use in anachronism, roleplaying, and, in this case, as a zipper tab. At least it should keep you warm on your ivory pillar."
+ icon_state = "coatrd"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 20, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/science/rd
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering
name = "engineering winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. There seems to be a thin weave of lead on the inside."
icon_state = "coatengineer"
item_state_slots = list(slot_r_hand_str = "coatengineer", slot_l_hand_str = "coatengineer")
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
hoodtype = /obj/item/clothing/head/hood/winter/engineering
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer, /obj/item/device/flashlight,
/obj/item/device/multitool, /obj/item/device/pipe_painter, /obj/item/device/radio, /obj/item/device/t_scanner, /obj/item/weapon/tool/crowbar, /obj/item/weapon/tool/screwdriver,
/obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, /obj/item/weapon/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
name = "atmospherics winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. It seems to have burn marks on the inside from a phoron fire."
icon_state = "coatatmos"
item_state_slots = list(slot_r_hand_str = "coatatmos", slot_l_hand_str = "coatatmos")
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
hoodtype = /obj/item/clothing/head/hood/winter/engineering/atmos
+/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce
+ name = "atmospherics winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. It seems to have burn marks on the inside from a phoron fire."
+ icon_state = "coatce"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
+ hoodtype = /obj/item/clothing/head/hood/winter/engineering/ce
+
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro
name = "hydroponics winter coat"
+ desc = "A heavy jacket made from synthetic animal furs. There's a small tag that says 'Vegan Friendly'."
icon_state = "coathydro"
item_state_slots = list(slot_r_hand_str = "coathydro", slot_l_hand_str = "coathydro")
hoodtype = /obj/item/clothing/head/hood/winter/hydro
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
- /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/device/analyzer/plant_analyzer, /obj/item/seeds, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/material/minihoe)
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen,
+ /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask,
+ /obj/item/device/suit_cooling_unit, /obj/item/weapon/reagent_containers/spray/plantbgone, /obj/item/device/analyzer/plant_analyzer, /obj/item/seeds,
+ /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/material/minihoe)
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo
name = "cargo winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. It seems to be rather rugged, from the back-breaking work of pushing crates."
icon_state = "coatcargo"
item_state_slots = list(slot_r_hand_str = "coatcargo", slot_l_hand_str = "coatcargo")
hoodtype = /obj/item/clothing/head/hood/winter/cargo
+/obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm
+ name = "quartermaster's winter coat"
+ desc = "A dark brown winter coat that has a golden crate pin for its zipper pully."
+ icon_state = "coatqm"
+ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/hood/winter/cargo/qm
+
/obj/item/clothing/suit/storage/hooded/wintercoat/miner
name = "mining winter coat"
+ desc = "A heavy jacket made from real animal furs. The miner who made this must have been through the Underdark."
icon_state = "coatminer"
item_state_slots = list(slot_r_hand_str = "coatminer", slot_l_hand_str = "coatminer")
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
- hoodtype = /obj/item/clothing/head/hood/winter/miner
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches,
- /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/tank, /obj/item/device/radio, /obj/item/weapon/pickaxe, /obj/item/weapon/storage/bag/ore)
+ hoodtype = /obj/item/clothing/head/hood/winter/cargo/miner
+ allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/storage/fancy/cigarettes,
+ /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit,
+ /obj/item/weapon/tank, /obj/item/device/radio, /obj/item/weapon/pickaxe, /obj/item/weapon/storage/bag/ore)
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/bar
+ name = "bartender winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs. It smells of booze."
+ icon_state = "coatbar"
+ hoodtype = /obj/item/clothing/head/hood/winter/bar
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/janitor
+ name = "janitor winter coat"
+ desc = "A purple-and-beige winter coat that smells of space cleaner."
+ icon_state = "coatjanitor"
+ hoodtype = /obj/item/clothing/head/hood/winter/janitor
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/aformal
+ name = "assistant formal winter coat"
+ desc = "A black button up winter coat."
+ icon_state = "coataformal"
+ hoodtype = /obj/item/clothing/head/hood/winter/aformal
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/ratvar
+ name = "brassy winter coat"
+ desc = "A softly-glowing, brass-colored button up winter coat. Instead of a zipper tab, it has a brass cog with a tiny red gemstone inset."
+ icon_state = "coatratvar"
+ hoodtype = /obj/item/clothing/head/hood/winter/ratvar
+ light_range = 3
+ light_power = 1
+ light_color = "#B18B25" //clockwork slab background top color
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/narsie
+ name = "runed winter coat"
+ desc = "A somber button-up in tones of grey entropy and a wicked crimson zipper. When pulled all the way up, the zipper looks like a bloody gash. The zipper pull looks like a single drop of blood."
+ icon_state = "coatnarsie"
+ hoodtype = /obj/item/clothing/head/hood/winter/narsie
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
+ name = "cosmic winter coat"
+ desc = "A starry winter coat that even glows softly."
+ icon_state = "coatcosmic"
+ hoodtype = /obj/item/clothing/head/hood/winter/cosmic
+ light_power = 1.8
+ light_range = 1.2
+
+// winter coats end here
/obj/item/clothing/suit/storage/hooded/explorer
name = "explorer suit"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
index 43c914e739..73a5fe0912 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
@@ -47,9 +47,10 @@
attack_armor_pen = 25
pixel_x = -16
- pixel_y = -16
+ pixel_y = 0
+ default_pixel_x = -16
old_x = -16
- old_y = -16
+ old_y = 0
/mob/living/simple_mob/animal/giant_spider/nurse/eggless/lay_eggs(turf/T)
return FALSE
diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm
index bbca4eef0d..cba6ebb6c5 100644
--- a/code/modules/multiz/movement_vr.dm
+++ b/code/modules/multiz/movement_vr.dm
@@ -1,6 +1,6 @@
/mob/living/handle_fall(var/turf/landing)
- var/mob/drop_mob = locate(/mob, landing)
+ var/mob/drop_mob = locate(/mob/living, landing)
if(locate(/obj/structure/stairs) in landing)
for(var/atom/A in landing)
@@ -17,7 +17,7 @@
if(!O.CanFallThru(src, landing))
return 1
- if(drop_mob && !(drop_mob == src) && ismob(drop_mob) && isliving(drop_mob)) //Shitload of checks. This is because the game finds various ways to screw me over.
+ if(drop_mob && !(drop_mob == src)) //Shitload of checks. This is because the game finds various ways to screw me over.
var/mob/living/drop_living = drop_mob
if(drop_living.dropped_onto(src))
return
@@ -105,4 +105,4 @@
if(direction == UP) //on a turf below, trying to enter
return 0
if(direction == DOWN) //on a turf above, trying to enter
- return 1
\ No newline at end of file
+ return 1
diff --git a/icons/mecha/fighters64x64.dmi b/icons/mecha/fighters64x64.dmi
index 6025a94c86..4c9fd660bf 100644
Binary files a/icons/mecha/fighters64x64.dmi and b/icons/mecha/fighters64x64.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index d89dafc909..a61d7e9173 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi
index c4f7a47b69..77aeb8bff7 100644
Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ
diff --git a/icons/mob/species/teshari/helmet_vr.dmi b/icons/mob/species/teshari/helmet_vr.dmi
index 72074b0473..757bfea1f2 100644
Binary files a/icons/mob/species/teshari/helmet_vr.dmi and b/icons/mob/species/teshari/helmet_vr.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 5fc3080206..58b92c82dd 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/card_new_vr.dmi b/icons/obj/card_new_vr.dmi
index 20e3c85583..496b1fda27 100644
Binary files a/icons/obj/card_new_vr.dmi and b/icons/obj/card_new_vr.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index e1c5517021..4951bf32ad 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/helmets_vr.dmi b/icons/obj/clothing/helmets_vr.dmi
index f635aae960..4d8beae127 100644
Binary files a/icons/obj/clothing/helmets_vr.dmi and b/icons/obj/clothing/helmets_vr.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 5c1f3246d5..788bfa06ba 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi
index fcfe8095eb..1e8faff31f 100644
Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ
diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm
index 260f2915a2..2cd4a4aed1 100644
--- a/maps/offmap_vr/talon/talon_v2.dm
+++ b/maps/offmap_vr/talon/talon_v2.dm
@@ -47,7 +47,7 @@ var/global/list/latejoin_talon = list()
vessel_mass = 10000
vessel_size = SHIP_SIZE_LARGE
initial_generic_waypoints = list("talon_v2_near_fore_port", "talon_v2_near_fore_star", "talon_v2_near_aft_port", "talon_v2_near_aft_star", "talon_v2_wing_port", "talon_v2_wing_star")
- initial_restricted_waypoints = list("Talon's boat" = list("offmap_spawn_talonboat"))
+ initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat"))
skybox_icon = 'talon.dmi' //Art by Gwyvern, distributed under Creative Commons license
skybox_icon_state = "skybox"
@@ -56,20 +56,20 @@ var/global/list/latejoin_talon = list()
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/talonboat
- name = "boat control console"
- shuttle_tag = "Talon's boat"
+ name = "shuttle control console"
+ shuttle_tag = "Talon's Shuttle"
req_one_access = list(access_talon)
/obj/effect/overmap/visitable/ship/landable/talon_boat
- name = "Talon's Boat"
+ name = "ITV Talon Shuttle"
desc = "A small shuttle from the ITV Talon."
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
- shuttle = "Talon's boat"
+ shuttle = "Talon's Shuttle"
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/talonboat
- name = "Talon's boat bay"
+ name = "Talon's shuttle bay"
base_area = /area/talon_v2/hangar
base_turf = /turf/simulated/floor/reinforced
landmark_tag = "offmap_spawn_talonboat"
@@ -78,7 +78,7 @@ var/global/list/latejoin_talon = list()
// The talon's boat
/datum/shuttle/autodock/overmap/talonboat
- name = "Talon's boat"
+ name = "Talon's Shuttle"
current_location = "offmap_spawn_talonboat"
docking_controller_tag = "talonboat_docker"
shuttle_area = /area/shuttle/talonboat
@@ -86,7 +86,10 @@ var/global/list/latejoin_talon = list()
defer_initialisation = TRUE
/area/shuttle/talonboat
- name = "Talon's Boat"
+ name = "Talon's Shuttle"
+ requires_power = 1
+ icon = 'icons/turf/areas_vr_talon.dmi'
+ icon_state = "green"
///////////////////////////
//// The Various Machines
@@ -113,18 +116,20 @@ good luck
\
info = {"to whoever's saddled with running this rustbucket this week,
\
good news! you may have noticed the entire ship was replaced pretty much overnight.
\
that or it changed shape or something? whatever, not important.
\
-what is important is that it no longer runs off solar arrays. now we have a pair of tritium generators.
\
-they're in the shielded compartment just across from the big white SMES bricks.
\
-jam the tritium pucks in the hoppers (not too rough and messy though) and fire them up!
\
-you shouldn't need to push power generation past 50kW per generator unless it's an emergency, so let it run slow and save the fuel.
\
-congrats, power is good to go!
\
+what is important is that it no longer runs off solar arrays. now we have a pair of radioisotope thermoelectric generators (or 'RTGs' as the kids call them) and a PTTO (or 'potato'... don't ask) mini reactor.
\
+they're all in the shielded compartment just across from the big white SMES bricks.
\
+the radioisotope buggers are basically reserves; they'll run themselves pretty much forever and provide just enough juice to run cryosupport plus allow you to kickstart power for the ship in an emergency, whilst the PTTO eats sheet uranium and puts out the big watts that keeps all the major stuff running.
\
+you shouldn't need to push power generation past 100kW unless it's an emergency or you've been drifting dark for a while, so let it run slow and save the fuel. initial draw will be a little high but once all the APCs are charged up it should settle down to about two-thirds 'peak'. do not push the PTTO past 200kW, or it'll start to overheat. too much heat and it'll explode. I don't need to tell you why that's bad.
\
+congrats, power is good to go! just keep in mind that the PTTO puts out hard rads whilst it's in use, so don't stand in the chamber too long whilst it's running. legal assures me it's fine but as far as I'm concerned any level of ionizing radiation is bad, y'know?
\
\
-just remember to actually go anywhere you'll also need to flip the output of each engine room's pumps up.
\
-if you somehow, somehow, start to run low on fuel, there are two reserve tanks and twelve(!) empty tanks.
\
-pray you can make it to the fuel depot on what gas you have left and fill up the tanks there.
\
+also! remember to actually go anywhere you'll also need to flip the output of each engine room's pumps up.
\
+if you somehow, somehow, start to run low on fuel, there are two reserve tanks in port engineering behind the atmos rig and twelve(!) empty tanks in the tail spars.
\
+the two reserve tanks are mostly for the shuttle, but if you're low then pray you can make it to the fuel depot on what gas you have left and fill up the tanks there.
\
alternately maybe you can trade some off those nanotrasen corpos down on 3B. atmosphere's full of the stuff, I'm sure they won't miss a little.
\
\
-Harry Townes"}
+Harry Townes
\
+
\
+p.s. speaking of shit that's bad for your health for the love of fuck do not smoke in the main engineering compartments, and definitely don't smoke in the engine rooms! if the ass-end of the ship ends up blown off because you went for a smoke break in a room full of crazy-flammable phoron they'll stick your reconstituted atoms so far in debt-prison you won't see daylight for a century."}
/obj/item/weapon/paper/talon_doctor
name = "new medical bay"
@@ -171,9 +176,11 @@ what is important is that the shuttle has been replaced. it is now capable of fu
but the rear airlock is a bit fussy. be sure to use the manual switches on each side of the airlock if you're matching another airlock and one side is exposed to vacuum or a hostile atmosphere!
\
also be sure that it's locked down before you take off, the automatic switch is a bit stupid sometimes!
\
\
-finally, make sure you check the shuttle's APC power level before you head out! it can be fussy about (re)charging off the main ship grid sometimes. despite having someone in to look at the cables, we couldn't figure out why.
\
+finally, make sure you check the shuttle's APC power level before you head out! it used to be fussy, so we had a pro come in to double-check our setup and he yanked some weird gubbin I'd never seen before out of a wall panel, nodded to himself, and then walked off without saying anything else. weird but now it seems to behave.
\
I recommend packing a spare battery (there should be a few in engineering you can borrow and charge up) to be safe. don't wanna get stranded!
\
\
+speaking of, if some dumbass does take it and fly off solo then get themselves killed, you can use the remote console in the little spot north of the hangar to initiate basic remote maneuvers. it can't do long-range flight, but the shuttle has some basic autopilot routines for stable orbit and docking that you can ping. this won't help if the shuttle's grounded and out of battery, but better than nothing, right?
\
+
\
Harry Townes"}
//Prevents remote control of drones
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 1e00adc6a0..3a7d345357 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -47,6 +47,22 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/fore)
+"af" = (
+/obj/structure/closet/secure_closet/talon_guard,
+/obj/item/device/radio/off{
+ channels = list("Talon" = 1)
+ },
+/obj/item/weapon/storage/box/nifsofts_security,
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/sec_room)
+"ag" = (
+/obj/structure/closet/secure_closet/talon_doctor,
+/obj/item/device/radio/off{
+ channels = list("Talon" = 1)
+ },
+/obj/item/weapon/storage/box/nifsofts_medical,
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/med_room)
"ah" = (
/obj/structure/cable/green{
d1 = 4;
@@ -97,6 +113,30 @@
},
/turf/simulated/floor/reinforced/airless,
/area/talon_v2/engineering/port)
+"al" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/central_hallway)
+"am" = (
+/obj/machinery/alarm/talon{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc/talon{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 28
+ },
+/obj/structure/table/steel,
+/obj/item/weapon/storage/box/nifsofts_mining,
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/refining)
"an" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/light_switch{
@@ -110,6 +150,39 @@
/obj/random/maintenance/engineering,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port_store)
+"ap" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/table/steel,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 32
+ },
+/obj/fiftyspawner/uranium,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
+"aq" = (
+/obj/machinery/recharge_station,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
+"ar" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/table/steel,
+/obj/machinery/recharger,
+/obj/item/device/geiger{
+ pixel_x = -7
+ },
+/obj/machinery/alarm/talon{
+ pixel_y = 24
+ },
+/obj/machinery/camera/network/talon{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
"as" = (
/obj/machinery/holoposter{
dir = 8;
@@ -127,6 +200,18 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port)
+"au" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
"av" = (
/obj/structure/table/standard,
/obj/machinery/recharger,
@@ -153,6 +238,14 @@
},
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/med_room)
+"ax" = (
+/obj/structure/closet/secure_closet/talon_engineer,
+/obj/item/device/radio/off{
+ channels = list("Talon" = 1)
+ },
+/obj/item/weapon/storage/box/nifsofts_engineering,
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/eng_room)
"ay" = (
/obj/machinery/disposal/wall{
dir = 4
@@ -162,6 +255,44 @@
},
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/meditation)
+"az" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/catwalk,
+/obj/machinery/power/apc/talon/hyper{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
+"aA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
"aB" = (
/obj/structure/cable/green{
d1 = 1;
@@ -199,6 +330,50 @@
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port)
+"aD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
+"aE" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass/talon,
+/obj/machinery/door/airlock/hatch{
+ name = "Generator Room";
+ req_one_access = list(301)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/sign/warning/radioactive{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
"aF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/vending/medical_talon{
@@ -206,20 +381,33 @@
},
/turf/simulated/floor/tiled/white,
/area/talon_v2/medical)
+"aG" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
"aH" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- dir = 1
- },
/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/structure/handrail{
- dir = 1
- },
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/structure/closet/autolok_wall{
- dir = 1;
- pixel_y = -32
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
@@ -228,6 +416,17 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
+"aJ" = (
+/obj/structure/cable/yellow,
+/obj/machinery/power/rtg/advanced,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
+"aK" = (
+/obj/structure/cable/yellow,
+/obj/machinery/light/small,
+/obj/machinery/power/port_gen/pacman/super/potato,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/generators)
"aL" = (
/obj/structure/cable/green{
d1 = 4;
@@ -257,6 +456,37 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/bridge)
+"aP" = (
+/obj/machinery/power/apc/talon/hyper{
+ pixel_y = -24
+ },
+/obj/effect/catwalk_plated/dark,
+/obj/structure/closet/walllocker_double/hydrant/west,
+/obj/structure/cable/green,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
+"aQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
"aR" = (
/obj/structure/cable/green{
d1 = 4;
@@ -299,11 +529,24 @@
/obj/machinery/camera/network/talon,
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/fore)
+"aV" = (
+/obj/machinery/light/small,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 2;
+ pixel_y = -28
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
"aW" = (
/obj/effect/shuttle_landmark/shuttle_initializer/talonboat,
-/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
- dir = 1
- },
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -313,14 +556,13 @@
dir = 4
},
/obj/effect/overmap/visitable/ship/landable/talon_boat,
-/obj/machinery/button/remote/blast_door{
- id = "talon_boat_west";
- pixel_y = 28
- },
/obj/structure/handrail,
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"aZ" = (
@@ -499,6 +741,19 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
+"bK" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/talon_v2/maintenance/wing_starboard)
"bM" = (
/obj/structure/cable/green{
d1 = 1;
@@ -543,13 +798,6 @@
},
/turf/simulated/floor/tiled/white,
/area/talon_v2/medical)
-"bT" = (
-/obj/structure/closet/secure_closet/talon_guard,
-/obj/item/device/radio/off{
- channels = list("Talon" = 1)
- },
-/turf/simulated/floor/wood,
-/area/talon_v2/crew_quarters/sec_room)
"bU" = (
/obj/structure/table/steel,
/obj/item/device/measuring_tape,
@@ -564,7 +812,7 @@
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"bX" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -831,6 +1079,11 @@
dir = 4;
pixel_x = 26
},
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/fore_port)
"cT" = (
@@ -1072,13 +1325,13 @@
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_starboard)
"dw" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/vending/wallmed1{
+ emagged = 1;
+ pixel_y = 32;
+ shut_up = 0
},
-/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/central_hallway)
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/bar)
"dz" = (
/obj/machinery/door/firedoor/glass/talon,
/obj/structure/grille,
@@ -1138,6 +1391,11 @@
dir = 1;
pixel_y = -32
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"dG" = (
@@ -1730,7 +1988,7 @@
name = "Storage Room"
},
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"fq" = (
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
@@ -1825,15 +2083,7 @@
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/cap_room)
"fC" = (
-/obj/machinery/vending/wallmed1{
- emagged = 1;
- pixel_y = 32;
- shut_up = 0
- },
-/obj/machinery/alarm/talon{
- dir = 4;
- pixel_x = -22
- },
+/obj/structure/reagent_dispensers/water_cooler/full,
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/bar)
"fF" = (
@@ -1878,6 +2128,18 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/star)
+"fQ" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
"fR" = (
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/obj/machinery/airlock_sensor{
@@ -1972,27 +2234,42 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/armory)
"gj" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/catwalk,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
+/obj/machinery/power/sensor{
+ name = "Talon Power Generation";
+ name_tag = "TLN-PWR-GEN"
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering)
+"gl" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"gm" = (
@@ -2108,6 +2385,17 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/brig)
+"gD" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 8
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/space)
"gE" = (
/obj/structure/catwalk,
/obj/machinery/firealarm{
@@ -2350,10 +2638,21 @@
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/meditation)
"hD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 6
+/obj/structure/closet/autolok_wall{
+ dir = 1;
+ pixel_y = -32
},
-/turf/simulated/wall/rshull,
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 4
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"hG" = (
/obj/structure/cable/green{
@@ -2502,6 +2801,11 @@
pixel_y = 28
},
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_starboard)
"in" = (
@@ -2510,6 +2814,16 @@
"iq" = (
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/eng_room)
+"ir" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/random/multiple/corp_crate/talon_cargo,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/maintenance/wing_port)
"iv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 6
@@ -2543,6 +2857,11 @@
dir = 8
},
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"iz" = (
@@ -2601,6 +2920,15 @@
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering/star_store)
+"iM" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_starboard)
"iN" = (
/obj/machinery/vending/engivend{
products = list(/obj/item/device/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm, /obj/item/weapon/circuitboard/guestpass, /obj/item/weapon/circuitboard/keycard_auth, /obj/item/weapon/circuitboard/photocopier, /obj/item/weapon/circuitboard/fax, /obj/item/weapon/circuitboard/request, /obj/item/weapon/circuitboard/microwave, /obj/item/weapon/circuitboard/washing, /obj/item/weapon/circuitboard/scanner_console, /obj/item/weapon/circuitboard/sleeper_console, /obj/item/weapon/circuitboard/body_scanner, /obj/item/weapon/circuitboard/sleeper, /obj/item/weapon/circuitboard/dna_analyzer, /obj/item/weapon/circuitboard/partslathe);
@@ -2647,6 +2975,17 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/bridge)
+"jb" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"jc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2822,6 +3161,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"jQ" = (
@@ -2834,7 +3178,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"jS" = (
/obj/machinery/mineral/output,
/obj/machinery/conveyor{
@@ -2884,14 +3228,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/maintenance/wing_port)
"kg" = (
-/obj/machinery/computer/cryopod{
- pixel_y = 32
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/floor_decal/emblem/talon,
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway)
"ki" = (
/obj/machinery/atmospherics/unary/engine/bigger{
@@ -3072,26 +3409,34 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port_store)
"kM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 10
+/obj/structure/closet/autolok_wall{
+ dir = 1;
+ pixel_y = -32
},
-/turf/simulated/wall/rshull,
-/area/shuttle/talonboat)
-"kP" = (
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/camera/network/talon{
+/obj/structure/handrail{
dir = 1
},
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/talonboat)
+"kP" = (
/obj/structure/extinguisher_cabinet{
dir = 1;
pixel_y = -32
},
+/obj/machinery/power/smes/buildable/offmap_spawn{
+ RCon_tag = "Talon Port SMES"
+ },
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"kR" = (
@@ -3392,7 +3737,7 @@
pixel_y = -26
},
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"lI" = (
/obj/structure/cable/green{
d1 = 4;
@@ -3414,13 +3759,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/armory)
-"lK" = (
-/obj/structure/closet/secure_closet/talon_engineer,
-/obj/item/device/radio/off{
- channels = list("Talon" = 1)
- },
-/turf/simulated/floor/wood,
-/area/talon_v2/crew_quarters/eng_room)
"lM" = (
/obj/effect/landmark/start{
name = "Talon Captain"
@@ -3466,6 +3804,16 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
+"lS" = (
+/obj/machinery/door/firedoor/glass/talon,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_port)
"lT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -3489,6 +3837,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"lW" = (
@@ -3586,6 +3939,15 @@
/obj/random/multiple/corp_crate/talon_cargo,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/maintenance/wing_starboard)
+"mm" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_starboard)
"mo" = (
/obj/effect/floor_decal/industrial/warning/dust/corner{
dir = 8
@@ -3710,28 +4072,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
-"mN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"mO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/railing/grey{
@@ -3772,18 +4112,11 @@
/area/talon_v2/refining)
"mT" = (
/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- dir = 1
- },
-/obj/structure/handrail{
- dir = 1
- },
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/obj/structure/closet/autolok_wall{
- dir = 1;
- pixel_y = -32
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
@@ -3841,12 +4174,40 @@
},
/turf/simulated/floor/reinforced/airless,
/area/space)
+"ng" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/camera/network/talon{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/talon_v2/central_hallway)
"nh" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 9
},
/turf/simulated/floor/reinforced/airless,
/area/talon_v2/engineering/starboard)
+"nk" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/wall/rshull,
+/area/talon_v2/maintenance/wing_port)
"nl" = (
/obj/structure/cable/green{
d1 = 1;
@@ -3910,6 +4271,9 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
+/obj/item/modular_computer/console/preset/talon{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering)
"nz" = (
@@ -3969,12 +4333,12 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway/fore)
"nI" = (
-/obj/machinery/power/terminal{
- dir = 4
+/obj/machinery/power/smes/buildable/offmap_spawn{
+ RCon_tag = "Talon Port SMES"
},
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
@@ -4069,7 +4433,8 @@
/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
dir = 4;
pixel_x = 11;
- pixel_y = 24
+ pixel_y = 24;
+ req_one_access = list(301)
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
@@ -4140,8 +4505,11 @@
"ox" = (
/obj/structure/cable/green{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/light{
+ dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
@@ -4155,7 +4523,10 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"oA" = (
-/obj/effect/floor_decal/industrial/warning/corner{
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -4304,6 +4675,10 @@
},
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/wing_starboard)
+"pk" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
+/turf/simulated/wall/rshull,
+/area/shuttle/talonboat)
"pl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4313,10 +4688,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
-"pm" = (
-/obj/structure/closet/walllocker_double/hydrant/north,
-/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/central_hallway)
"pn" = (
/obj/structure/flora/pottedplant/fern,
/obj/machinery/holoposter{
@@ -4344,6 +4715,7 @@
dir = 4;
icon_state = "pipe-j2"
},
+/obj/structure/closet/walllocker_double/hydrant/east,
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"pr" = (
@@ -4358,14 +4730,15 @@
/area/talon_v2/engineering/atmospherics)
"pt" = (
/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/structure/railing/grey{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"pv" = (
@@ -4417,10 +4790,16 @@
/turf/simulated/floor/carpet/blucarpet,
/area/talon_v2/crew_quarters/cap_room)
"pA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction/yjunction{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"pB" = (
@@ -4488,11 +4867,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway/fore)
"pN" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/obj/machinery/light,
/turf/simulated/floor/carpet,
/area/talon_v2/crew_quarters/pilot_room)
"pQ" = (
@@ -4555,24 +4929,17 @@
/turf/simulated/floor/carpet/blucarpet,
/area/talon_v2/crew_quarters/cap_room)
"qc" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
+/obj/structure/bed/chair/bay/chair,
+/obj/machinery/alarm/talon{
+ pixel_y = 24
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/bar)
"qe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/light_switch{
dir = 8;
pixel_x = 24
@@ -4634,6 +5001,17 @@
"qp" = (
/turf/simulated/wall/shull,
/area/talon_v2/crew_quarters/bar)
+"qq" = (
+/obj/structure/closet/walllocker_double/south,
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/item/weapon/storage/toolbox/mechanical,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/talonboat)
"qr" = (
/turf/simulated/wall/shull,
/area/talon_v2/crew_quarters/med_room)
@@ -4651,24 +5029,16 @@
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/port)
"qt" = (
-/obj/structure/cable/yellow{
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/talon,
-/obj/machinery/door/airlock/hatch{
- name = "Generator Room";
- req_one_access = list(301)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"qu" = (
/obj/structure/barricade,
/turf/simulated/floor/plating,
@@ -4795,8 +5165,17 @@
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/star)
"qL" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/turf/simulated/wall/rshull,
+/obj/structure/closet/walllocker_double/south,
+/obj/machinery/light,
+/obj/item/weapon/extinguisher,
+/obj/item/stack/cable_coil/green,
+/obj/item/stack/cable_coil/green,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
+ },
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"qN" = (
/turf/simulated/wall/shull{
@@ -4873,6 +5252,17 @@
/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
+"qX" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/space)
"rg" = (
/obj/machinery/door/firedoor/glass/talon,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4974,6 +5364,11 @@
icon_state = "0-2"
},
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"rx" = (
@@ -5316,10 +5711,17 @@
name = "south bump";
pixel_y = -24
},
-/obj/structure/cable/green,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/green{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"sK" = (
@@ -5372,6 +5774,15 @@
/obj/random/multiple/corp_crate/talon_cargo,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/maintenance/wing_port)
+"sV" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_starboard)
"sZ" = (
/obj/structure/catwalk,
/obj/machinery/light/small{
@@ -5575,14 +5986,18 @@
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/armory)
"tB" = (
-/obj/machinery/power/smes/buildable/offmap_spawn{
- RCon_tag = "Talon Port SMES"
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
/obj/structure/cable/green{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/obj/structure/cable/green,
+/obj/structure/closet/walllocker_double/east,
+/obj/item/weapon/storage/toolbox/electrical,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"tC" = (
@@ -5591,8 +6006,9 @@
"tD" = (
/obj/structure/table/rack/shelf/steel,
/obj/random/maintenance/cargo,
+/obj/random/maintenance/cargo,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"tE" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
@@ -5604,19 +6020,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/talonboat)
-"tI" = (
-/obj/machinery/camera/network/talon,
-/obj/machinery/power/apc/talon/hyper{
- dir = 1;
- pixel_y = 24
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/catwalk_plated/dark,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"tJ" = (
/obj/structure/railing/grey{
dir = 4
@@ -5701,6 +6104,12 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/brig)
+"ub" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
+ },
+/turf/simulated/wall/rshull,
+/area/shuttle/talonboat)
"uc" = (
/obj/structure/cable/green{
d1 = 1;
@@ -5947,10 +6356,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/talonboat)
"uV" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+/obj/structure/closet/walllocker_double/south,
+/obj/structure/handrail{
dir = 1
},
-/turf/simulated/wall/rshull,
+/obj/item/weapon/storage/toolbox/emergency,
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
+/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"uW" = (
/obj/structure/table/rack/steel,
@@ -5980,39 +6392,32 @@
/obj/structure/sign/department/eng{
pixel_y = -32
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"vb" = (
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+/obj/machinery/power/terminal{
+ dir = 4
},
-/obj/structure/cable/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/power/sensor{
- name = "Talon Power Generation";
- name_tag = "TLN-PWR-GEN"
- },
-/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
+"vc" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_starboard)
"vd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -6131,6 +6536,7 @@
dir = 8
},
/obj/structure/table/steel,
+/obj/random/maintenance/engineering,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering)
"vA" = (
@@ -6167,6 +6573,11 @@
},
/obj/structure/catwalk,
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"vE" = (
@@ -6414,10 +6825,6 @@
/obj/structure/bed/chair/bay/chair{
dir = 1
},
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
/turf/simulated/floor/carpet,
/area/talon_v2/crew_quarters/eng_room)
"wy" = (
@@ -6479,6 +6886,15 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/secure_storage)
+"wN" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_starboard)
"wO" = (
/obj/structure/bed/chair/bay/comfy/brown{
dir = 1
@@ -6530,15 +6946,9 @@
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/engineering/atmospherics)
"wX" = (
-/obj/structure/closet/walllocker_double/south,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- dir = 1
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
+ dir = 4
},
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/structure/handrail{
- dir = 1
- },
-/obj/item/weapon/storage/toolbox/emergency,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"wZ" = (
@@ -6634,6 +7044,15 @@
/obj/structure/table/marble,
/turf/simulated/floor/tiled/white,
/area/talon_v2/crew_quarters/bar)
+"xr" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_starboard)
"xt" = (
/obj/structure/cable/green{
d1 = 2;
@@ -6693,17 +7112,18 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"xB" = (
+/obj/machinery/power/pointdefense{
+ id_tag = "talon_pd"
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 5
+ },
/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d2 = 2;
+ icon_state = "0-2"
},
-/obj/machinery/holoposter{
- dir = 1;
- pixel_y = 32
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/central_hallway)
+/turf/simulated/floor/reinforced/airless,
+/area/space)
"xE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -6739,6 +7159,11 @@
pixel_x = 22
},
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/fore_port)
"xM" = (
@@ -6883,6 +7308,11 @@
/obj/machinery/holoposter{
pixel_y = -32
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"yj" = (
@@ -6934,6 +7364,13 @@
/obj/item/device/radio/off{
channels = list("Talon" = 1)
},
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"yp" = (
@@ -7065,6 +7502,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
/turf/simulated/floor/carpet,
/area/talon_v2/crew_quarters/eng_room)
"yV" = (
@@ -7217,23 +7658,18 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/random/maintenance/cargo,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"zB" = (
/obj/structure/table/rack/shelf/steel,
/obj/item/clothing/head/helmet/space/void/refurb/talon,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/secure_storage)
"zC" = (
-/obj/structure/closet/walllocker_double/south,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
- dir = 1
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
+ dir = 8
},
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/structure/handrail{
- dir = 1
- },
-/obj/item/weapon/storage/toolbox/mechanical,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"zF" = (
@@ -7365,13 +7801,6 @@
/obj/structure/cable/green,
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/bar)
-"Ae" = (
-/obj/structure/closet/secure_closet/talon_doctor,
-/obj/item/device/radio/off{
- channels = list("Talon" = 1)
- },
-/turf/simulated/floor/wood,
-/area/talon_v2/crew_quarters/med_room)
"Ag" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux,
/obj/structure/cable/green{
@@ -7405,6 +7834,11 @@
/obj/structure/sign/department/telecoms{
pixel_y = -31
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"As" = (
@@ -7438,9 +7872,24 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/maintenance/wing_port)
+"Av" = (
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_starboard)
"Aw" = (
-/obj/machinery/camera/network/talon,
-/turf/simulated/floor/tiled/techmaint,
+/obj/machinery/door/firedoor/glass/talon,
+/obj/machinery/door/airlock/glass{
+ name = "Flight Control"
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway)
"Ax" = (
/obj/structure/cable/green{
@@ -7547,6 +7996,12 @@
/obj/machinery/door/blast/regular/open{
id = "talon_boat_east"
},
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "talon_boat_east";
+ pixel_y = -28;
+ req_one_access = list(301)
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"AO" = (
@@ -7595,25 +8050,30 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
"AU" = (
-/obj/structure/cable/yellow{
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/random/multiple/corp_crate/talon_cargo,
+/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable/yellow{
- d1 = 2;
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/maintenance/wing_starboard)
+"AV" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ d1 = 4;
d2 = 8;
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/extinguisher_cabinet{
+ dir = 1;
+ pixel_y = -32
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"AW" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -7654,11 +8114,9 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
@@ -7677,7 +8135,7 @@
/turf/simulated/wall/shull{
can_open = 1
},
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"Bf" = (
/obj/machinery/shipsensors{
dir = 1
@@ -7698,17 +8156,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/fore)
-"Bj" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
"Bk" = (
/obj/machinery/atmospherics/binary/pump/high_power/on{
dir = 4
@@ -7864,9 +8311,6 @@
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"BK" = (
-/obj/machinery/light/small{
- dir = 1
- },
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/wall,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -8090,6 +8534,11 @@
/obj/structure/sign/department/shield{
pixel_y = -31
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"Cy" = (
@@ -8158,6 +8607,10 @@
dir = 4
},
/obj/item/weapon/paper/talon_pilot,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
/turf/simulated/floor/carpet,
/area/talon_v2/crew_quarters/pilot_room)
"CI" = (
@@ -8248,7 +8701,7 @@
/area/talon_v2/maintenance/wing_port)
"Dc" = (
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"Dd" = (
/turf/simulated/wall/shull,
/area/talon_v2/secure_storage)
@@ -8278,6 +8731,12 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/maintenance/wing_port)
+"Dj" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"Dm" = (
/obj/structure/cable/green{
d1 = 4;
@@ -8374,6 +8833,7 @@
dir = 4;
icon_state = "pipe-j2"
},
+/obj/structure/closet/walllocker_double/hydrant/west,
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"DH" = (
@@ -8391,7 +8851,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/maintenance/wing_starboard)
"DK" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/nifsoft_shop,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway/fore)
"DM" = (
@@ -8418,16 +8878,6 @@
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
-"DT" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/fiftyspawner/tritium,
-/obj/structure/table/steel,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"DU" = (
/obj/machinery/vending/boozeomat{
density = 0;
@@ -8453,25 +8903,6 @@
},
/turf/simulated/floor/tiled/white,
/area/talon_v2/crew_quarters/bar)
-"DV" = (
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = -30
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/structure/catwalk,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"DW" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -8480,6 +8911,22 @@
/obj/random/multiple/corp_crate/talon_cargo,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/maintenance/wing_port)
+"DX" = (
+/obj/machinery/power/pointdefense{
+ id_tag = "talon_pd"
+ },
+/obj/structure/cable/green{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 6
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 5
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/space)
"DY" = (
/obj/machinery/light/small{
dir = 4
@@ -8504,9 +8951,9 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/bridge)
"Eb" = (
-/obj/structure/table/rack/shelf/steel,
+/obj/structure/reagent_dispensers/watertank/high,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"Ef" = (
/obj/machinery/atmospherics/pipe/manifold/visible/red{
dir = 1
@@ -8514,27 +8961,15 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
-"Ej" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/light/small,
-/obj/structure/railing/grey{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering)
"Ek" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
+/obj/machinery/door/firedoor/glass/talon,
+/obj/machinery/door/airlock{
+ id_tag = "talon_pilotdoor";
+ name = "Pilot's Cabin";
+ req_one_access = list(301)
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/crew_quarters/pilot_room)
"En" = (
/obj/structure/table/standard,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -8670,11 +9105,24 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"EJ" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/wall/rshull,
/area/shuttle/talonboat)
+"EL" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/talon_v2/maintenance/wing_port)
"EN" = (
/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/storage/firstaid/o2,
@@ -8694,6 +9142,23 @@
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port)
+"EP" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_starboard)
"ES" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -8856,22 +9321,13 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"Fq" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/effect/landmark/talon,
+/obj/structure/handrail,
+/obj/machinery/computer/cryopod{
+ pixel_y = 32
},
-/obj/machinery/power/apc/talon{
- name = "south bump";
- pixel_y = -24
- },
-/obj/structure/cable/green{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/camera/network/talon{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/central_hallway)
"Fv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8879,9 +9335,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/bridge)
"Fx" = (
-/obj/machinery/light/small{
- dir = 8
- },
/obj/structure/catwalk,
/obj/structure/extinguisher_cabinet{
dir = 4;
@@ -8953,6 +9406,11 @@
/obj/structure/sign/department/atmos{
pixel_y = -32
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"FM" = (
@@ -9139,6 +9597,11 @@
/obj/machinery/camera/network/talon{
dir = 1
},
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"Gl" = (
@@ -9264,6 +9727,22 @@
},
/turf/simulated/floor/reinforced/airless,
/area/talon_v2/engineering/starboard)
+"GC" = (
+/obj/machinery/power/pointdefense{
+ id_tag = "talon_pd"
+ },
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 10
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 9
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/space)
"GE" = (
/obj/machinery/door/firedoor/glass/talon,
/obj/machinery/door/airlock/maintenance/engi{
@@ -9289,7 +9768,7 @@
pixel_y = 26
},
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"GH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -9656,18 +10135,6 @@
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering)
-"HV" = (
-/obj/structure/cable/yellow,
-/obj/machinery/power/apc/talon/hyper{
- pixel_y = -24
- },
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -24
- },
-/obj/effect/catwalk_plated/dark,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering)
"HW" = (
/obj/machinery/disposal/wall{
dir = 4
@@ -9705,6 +10172,11 @@
/obj/structure/catwalk,
/obj/machinery/door/firedoor/glass/talon,
/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/fore_port)
"Ie" = (
@@ -9748,6 +10220,12 @@
/obj/machinery/door/blast/regular/open{
id = "talon_boat_west"
},
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "talon_boat_west";
+ pixel_y = -28;
+ req_one_access = list(301)
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"Ii" = (
@@ -9787,11 +10265,6 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
"Im" = (
-/obj/structure/cable/green{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -9802,6 +10275,9 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
@@ -9939,11 +10415,22 @@
dir = 8;
pixel_x = -24
},
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_starboard)
"IK" = (
/turf/simulated/wall/rshull,
/area/talon_v2/engineering/generators)
+"IL" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 1
+ },
+/turf/simulated/wall/rshull,
+/area/shuttle/talonboat)
"IM" = (
/obj/structure/cable/green{
d1 = 1;
@@ -9971,6 +10458,11 @@
/obj/item/weapon/cell/apc,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering)
+"IP" = (
+/obj/structure/catwalk,
+/obj/structure/barricade,
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_port)
"IR" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 1
@@ -10019,10 +10511,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/eng_room)
-"IZ" = (
-/obj/structure/closet/walllocker_double/hydrant/south,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"Jd" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
@@ -10088,7 +10576,8 @@
/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
dir = 8;
pixel_x = -11;
- pixel_y = 24
+ pixel_y = 24;
+ req_one_access = list(301)
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
@@ -10113,6 +10602,11 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"Jt" = (
@@ -10167,6 +10661,23 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/talonboat)
+"JB" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_port)
"JC" = (
/obj/machinery/computer/ship/helm{
req_one_access = list(301)
@@ -10201,8 +10712,9 @@
/obj/structure/closet/crate,
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"JH" = (
/obj/structure/extinguisher_cabinet{
dir = 1;
@@ -10425,8 +10937,9 @@
/obj/structure/closet/crate,
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"Ks" = (
/obj/machinery/door/firedoor/glass/talon,
/obj/structure/grille,
@@ -10508,6 +11021,11 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/fore_port)
"KM" = (
@@ -10656,23 +11174,6 @@
/obj/machinery/camera/network/talon,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering/star_store)
-"Ln" = (
-/obj/machinery/alarm/talon{
- dir = 4;
- pixel_x = -22
- },
-/obj/structure/cable/green{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/talon{
- dir = 1;
- name = "north bump";
- pixel_y = 28
- },
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
"Lo" = (
/obj/structure/sign/warning/nosmoking_1{
pixel_x = -26
@@ -10686,13 +11187,16 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
"Lr" = (
-/obj/effect/floor_decal/industrial/warning/corner{
+/obj/effect/floor_decal/industrial/warning{
dir = 4
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/obj/structure/cable/green{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/hangar)
@@ -10733,7 +11237,11 @@
/area/space)
"LA" = (
/obj/structure/catwalk,
-/obj/structure/barricade,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"LB" = (
@@ -10789,23 +11297,18 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
"LL" = (
-/obj/structure/table/rack/shelf/steel,
/obj/machinery/light/small{
dir = 8
},
+/obj/structure/reagent_dispensers/fueltank/high,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"LM" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 1
},
-/obj/structure/closet/walllocker_double/south,
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/light,
-/obj/item/stack/cable_coil/green,
-/obj/item/stack/cable_coil/green,
-/obj/item/weapon/extinguisher,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"LN" = (
@@ -10814,9 +11317,34 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
+"LO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_port)
"LT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -10912,6 +11440,11 @@
dir = 8
},
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_starboard)
"Mo" = (
@@ -10946,6 +11479,11 @@
icon_state = "1-2"
},
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/fore_starboard)
"MA" = (
@@ -10979,25 +11517,21 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
"ME" = (
-/obj/machinery/button/remote/blast_door{
- id = "talon_boat_east";
- pixel_y = 28
- },
/obj/structure/handrail,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"MG" = (
@@ -11106,16 +11640,18 @@
/turf/simulated/floor/tiled/white,
/area/talon_v2/medical)
"Nc" = (
-/obj/machinery/power/smes/buildable/offmap_spawn{
- RCon_tag = "Talon Port SMES"
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
/obj/structure/cable/green{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/obj/structure/cable/green,
-/obj/structure/railing/grey{
- dir = 1
+/obj/machinery/camera/network/talon{
+ dir = 8
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
@@ -11292,20 +11828,14 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/maintenance/wing_starboard)
"NR" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
+/obj/structure/catwalk,
/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/structure/extinguisher_cabinet{
- dir = 1;
- pixel_y = -32
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_port)
"NS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
dir = 4
@@ -11325,15 +11855,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/light{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/cable/green{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/wall/shull,
/area/talon_v2/central_hallway)
"NV" = (
/turf/simulated/wall/rshull,
@@ -11514,16 +12039,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port)
-"OG" = (
-/obj/fiftyspawner/tritium,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/alarm/talon{
- dir = 8;
- pixel_x = 22
- },
-/obj/structure/table/steel,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"OH" = (
/obj/machinery/power/pointdefense{
id_tag = "talon_pd"
@@ -11576,16 +12091,16 @@
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/port)
"OL" = (
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/structure/railing/grey{
dir = 1
},
+/obj/machinery/power/smes/buildable/offmap_spawn{
+ RCon_tag = "Talon Port SMES"
+ },
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"OM" = (
@@ -11627,7 +12142,7 @@
/area/talon_v2/engineering/atmospherics)
"OQ" = (
/turf/simulated/wall/shull,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"OR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11983,10 +12498,8 @@
dir = 4
},
/obj/structure/railing/grey,
-/obj/item/modular_computer/console/preset/talon{
- dir = 1
- },
/obj/effect/floor_decal/industrial/warning,
+/obj/structure/table/steel,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering)
"Qb" = (
@@ -12033,6 +12546,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/port)
"Qk" = (
@@ -12089,6 +12607,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/aft_port)
"Qv" = (
@@ -12208,11 +12731,11 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"QM" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/atmospherics/unary/engine{
dir = 1
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
+/turf/simulated/floor/reinforced,
+/area/shuttle/talonboat)
"QN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet,
@@ -12261,18 +12784,20 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port)
"Rd" = (
-/obj/machinery/power/smes/buildable/offmap_spawn{
- RCon_tag = "Talon Port SMES"
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/structure/cable/green,
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"Re" = (
/obj/structure/closet/crate,
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
+/obj/random/maintenance/clean,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"Rf" = (
/turf/simulated/wall/shull{
can_open = 1
@@ -12621,19 +13146,18 @@
/area/talon_v2/crew_quarters/cap_room)
"St" = (
/obj/structure/cable/green{
- d1 = 2;
+ d1 = 4;
d2 = 8;
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/tiled/techmaint,
+/obj/machinery/computer/shuttle_control/explore/talonboat{
+ dir = 4;
+ name = "boat remote control console"
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway)
"Su" = (
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -12658,6 +13182,11 @@
dir = 4
},
/obj/structure/closet/walllocker_double/hydrant/south,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway)
"Sx" = (
@@ -12685,20 +13214,9 @@
/obj/machinery/cryopod/talon{
dir = 4
},
+/obj/machinery/camera/network/talon,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway)
-"SC" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering)
"SE" = (
/obj/machinery/light/small,
/obj/machinery/light_switch{
@@ -12824,16 +13342,6 @@
/obj/machinery/portable_atmospherics/canister/empty/phoron,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/star_store)
-"Tc" = (
-/obj/structure/sign/warning/nosmoking_1{
- pixel_x = -26
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering)
"Td" = (
/obj/structure/cable/green{
d1 = 1;
@@ -13010,6 +13518,15 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port_store)
+"TJ" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_starboard)
"TL" = (
/obj/machinery/alarm/talon{
dir = 8;
@@ -13020,6 +13537,7 @@
/obj/machinery/computer/ship/navigation/telescreen{
pixel_y = -32
},
+/obj/machinery/light,
/turf/simulated/floor/carpet,
/area/talon_v2/crew_quarters/pilot_room)
"TN" = (
@@ -13144,22 +13662,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/maintenance/wing_starboard)
-"Ul" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"Um" = (
/obj/machinery/mineral/mint,
/turf/simulated/floor/tiled/techfloor,
@@ -13341,6 +13843,19 @@
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
+"UR" = (
+/obj/machinery/power/pointdefense{
+ id_tag = "talon_pd"
+ },
+/obj/effect/floor_decal/industrial/warning/dust{
+ dir = 10
+ },
+/obj/structure/cable/green{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/space)
"UW" = (
/obj/machinery/power/pointdefense{
id_tag = "talon_pd"
@@ -13366,6 +13881,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/port)
"Vc" = (
@@ -13591,9 +14111,9 @@
dir = 1;
pixel_y = -25
},
-/obj/structure/table/rack/shelf/steel,
+/obj/structure/reagent_dispensers/foam,
/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"VY" = (
/obj/structure/closet/walllocker/emerglocker/east,
/obj/machinery/light{
@@ -13615,6 +14135,23 @@
},
/turf/simulated/floor/reinforced,
/area/shuttle/talonboat)
+"Wc" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/power/apc/talon{
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/structure/cable/green{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/camera/network/talon{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"Wd" = (
/obj/machinery/autolathe,
/turf/simulated/floor/tiled/techfloor,
@@ -13649,7 +14186,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/unused)
+/area/talon_v2/gen_store)
"Wm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -13697,15 +14234,17 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/bridge)
"Wr" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/structure/extinguisher_cabinet{
- dir = 1;
- pixel_y = -32
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/hangar)
+/obj/structure/bed/chair/bay/chair,
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/central_hallway)
"Ws" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13736,6 +14275,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"Wu" = (
@@ -13749,6 +14293,7 @@
/area/talon_v2/medical)
"Wy" = (
/obj/machinery/cryopod/talon,
+/obj/machinery/camera/network/talon,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway)
"Wz" = (
@@ -13851,11 +14396,33 @@
"WZ" = (
/turf/simulated/wall/shull,
/area/talon_v2/maintenance/aft_port)
+"Xa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/aft_port)
+"Xb" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/wall/rshull,
+/area/talon_v2/maintenance/wing_starboard)
"Xf" = (
/obj/machinery/telecomms/allinone/talon{
id = "talon_aio";
network = "Talon"
},
+/obj/machinery/light/small{
+ dir = 1
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering)
"Xh" = (
@@ -14092,14 +14659,17 @@
/area/space)
"XX" = (
/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/machinery/light{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/tiled/techmaint,
+/obj/machinery/computer/ship/sensors{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/central_hallway)
"XY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14402,13 +14972,13 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"YW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/starboard)
@@ -14504,13 +15074,6 @@
"Zk" = (
/turf/simulated/wall/rshull,
/area/talon_v2/engineering/port)
-"Zl" = (
-/obj/machinery/power/port_gen/pacman/mrs{
- anchored = 1
- },
-/obj/structure/cable/yellow,
-/turf/simulated/floor/plating,
-/area/talon_v2/engineering/generators)
"Zm" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -14531,21 +15094,31 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering)
"Zp" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
/obj/machinery/light_switch{
dir = 4;
pixel_x = -24
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/hangar)
+"Zr" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ dir = 1;
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"Zv" = (
/obj/structure/cable/green{
d1 = 1;
@@ -14698,6 +15271,12 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/talon_v2/maintenance/fore_port)
+"ZO" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/talon_v2/hangar)
"ZP" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -14739,6 +15318,15 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/brig)
+"ZY" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_starboard)
"ZZ" = (
/obj/machinery/atmospherics/binary/pump/on{
dir = 8;
@@ -19222,9 +19810,9 @@ Dp
yw
XP
XP
-XP
-aa
-aa
+Mu
+uK
+bA
aa
aa
aa
@@ -19364,10 +19952,10 @@ Qk
TR
XP
XP
+ZJ
+RD
+Kl
XP
-XP
-XP
-aa
aa
aa
aa
@@ -19507,8 +20095,8 @@ TR
TR
TR
TR
-XP
-XP
+gD
+QI
XP
XP
aa
@@ -19649,7 +20237,7 @@ TA
Wa
Wa
TR
-TR
+nk
TR
TR
XP
@@ -19791,7 +20379,7 @@ TA
Du
Ph
TA
-VD
+ir
vR
TR
TR
@@ -19933,7 +20521,7 @@ rm
NS
Ye
TA
-VD
+ir
CY
ty
vR
@@ -20075,7 +20663,7 @@ TA
TA
TA
TA
-VD
+ir
CY
Xi
CE
@@ -20217,7 +20805,7 @@ kf
le
OB
qV
-CE
+EL
CE
pa
Bv
@@ -21926,7 +22514,7 @@ Sn
tC
tC
tC
-XP
+UR
XP
XP
aa
@@ -22042,21 +22630,21 @@ aa
aa
aa
aa
-XP
-wi
-wi
-hS
-hS
+OH
+ML
+ML
+NR
+NR
cS
xL
-hS
-hS
+NR
+NR
Id
-hS
+NR
KI
-hS
-hS
-oU
+NR
+NR
+lS
Qj
Va
Iv
@@ -22068,7 +22656,7 @@ yg
qa
TX
tC
-tC
+aR
tC
tC
XP
@@ -22211,7 +22799,7 @@ WZ
NB
TX
LA
-Mi
+IP
tC
tC
tC
@@ -22355,8 +22943,8 @@ go
Qu
lV
iy
-gI
-TX
+Xa
+LO
tC
tC
tC
@@ -22373,7 +22961,7 @@ XP
XP
XP
XP
-XP
+GC
tm
tm
tm
@@ -22499,8 +23087,8 @@ Zc
Pl
Zc
Jr
-gI
-gI
+Xa
+Xa
vC
tC
aR
@@ -22515,7 +23103,7 @@ tC
tC
tC
tC
-tC
+aR
tC
tC
tC
@@ -22657,7 +23245,7 @@ rW
rW
LX
rW
-Qm
+JB
rW
rW
rW
@@ -22939,7 +23527,7 @@ yY
Er
rB
XH
-XH
+Cr
XH
qu
XH
@@ -23742,7 +24330,7 @@ Fz
VT
Qo
NC
-bT
+af
ai
QN
nE
@@ -23766,7 +24354,7 @@ lB
Iq
Iq
Iq
-XX
+Iq
ox
Gj
Zc
@@ -23908,8 +24496,8 @@ Ia
fV
Ks
Ks
+Ks
fV
-xB
FK
Zc
ZZ
@@ -24048,10 +24636,10 @@ Nf
As
Ns
Zp
-qc
+Ns
Lr
+jb
rI
-dw
jO
Zc
Uh
@@ -24191,9 +24779,9 @@ Jm
Ih
Tt
Tt
-NR
+Tt
+AV
fV
-dw
jO
Zc
rk
@@ -24317,8 +24905,8 @@ lU
lU
lU
Aw
-Hh
-yV
+NU
+fV
sf
Tt
Tt
@@ -24333,9 +24921,9 @@ aW
mT
hD
EJ
-Bj
+QM
+qt
yV
-dw
yh
Zc
hY
@@ -24458,8 +25046,8 @@ Ur
CH
Cd
lU
-pm
-Hh
+al
+St
yV
sf
Eo
@@ -24474,10 +25062,10 @@ Tt
RP
wX
uV
-EJ
-Bj
+IL
+QM
+qt
yV
-dw
dF
Zc
Zc
@@ -24486,9 +25074,9 @@ Zc
Zc
KX
IK
-DT
-DV
-Zl
+ap
+az
+aJ
IK
Zk
Zk
@@ -24599,9 +25187,9 @@ on
Jk
SL
pN
-lU
+Ek
kg
-Hh
+Wr
yV
sf
Eo
@@ -24616,21 +25204,21 @@ Fy
kI
LM
qL
+pk
Tt
-Fq
+Wc
fV
-NU
sJ
LY
gF
Qx
Fx
-mM
+gl
Ck
IK
-tI
-Ul
-IZ
+aq
+aA
+aK
IK
ei
eK
@@ -24742,8 +25330,8 @@ Eq
jg
TL
lU
-pG
-Hh
+al
+XX
yV
sf
Eo
@@ -24757,11 +25345,11 @@ hH
Tt
Ux
zC
-uV
-EJ
+qq
+IL
QM
+ZO
yV
-dw
Sv
LY
Xf
@@ -24770,9 +25358,9 @@ vz
Ii
AZ
IK
-OG
-mN
-Zl
+ar
+aD
+aJ
IK
ep
zm
@@ -24885,8 +25473,8 @@ lU
lU
lU
Aw
-Hh
-yV
+NU
+fV
sf
Tt
Tt
@@ -24900,10 +25488,10 @@ Tt
ME
aH
kM
-EJ
+ub
QM
+ZO
yV
-dw
jO
LY
wH
@@ -24913,7 +25501,7 @@ Qa
Zo
IK
IK
-qt
+aE
IK
IK
ex
@@ -25043,9 +25631,9 @@ ol
AN
Tt
Tt
-Wr
+Tt
+Zr
fV
-dw
Aq
LY
BK
@@ -25054,9 +25642,9 @@ Uw
Ho
Hc
yo
-Tc
-AU
-HV
+au
+aG
+aP
zm
eF
eN
@@ -25146,7 +25734,7 @@ VI
JO
cx
JO
-By
+dw
By
Zf
Ip
@@ -25184,10 +25772,10 @@ AW
Zh
by
qe
-Ek
+by
oA
+Dj
rI
-dw
Cx
LY
IN
@@ -25196,9 +25784,9 @@ Sr
jc
LN
Im
-LN
+fQ
gj
-SC
+aQ
Gb
IM
RO
@@ -25326,10 +25914,10 @@ fV
Yx
Ia
fV
+Ks
jM
jM
fV
-xB
va
LY
HU
@@ -25340,7 +25928,7 @@ pA
Bb
pt
vb
-Ej
+aV
zm
AL
AT
@@ -25430,7 +26018,7 @@ aa
XP
XP
JO
-OX
+qc
qI
oh
DU
@@ -25446,12 +26034,12 @@ dc
VT
mb
qr
-Ae
+ag
EH
iQ
AQ
qr
-vF
+Fq
pG
Hh
SY
@@ -25470,9 +26058,9 @@ pG
pG
pG
pG
+pG
SY
-dw
-Gj
+ng
LY
fx
KA
@@ -25613,7 +26201,7 @@ tx
LD
CO
vw
-St
+CO
Wt
FT
pw
@@ -25894,7 +26482,7 @@ RQ
ah
Ml
fW
-Ln
+am
Ok
dh
HT
@@ -26474,7 +27062,7 @@ AY
WJ
JK
Yp
-lK
+ax
kn
WJ
fb
@@ -26633,7 +27221,7 @@ rL
rL
bM
rL
-vL
+EP
rL
rL
rL
@@ -26759,9 +27347,9 @@ fW
dJ
cg
IJ
-LF
-hL
-hL
+Av
+vc
+mm
Dq
Lk
Dq
@@ -26775,7 +27363,7 @@ Dq
Dq
Dq
Dq
-Dq
+Lk
Dq
Dq
Dq
@@ -26896,11 +27484,11 @@ Ig
fW
dJ
hL
-hL
+xr
Mm
-hL
-hL
-hL
+vc
+vc
+mm
Dq
Dq
Dq
@@ -26917,7 +27505,7 @@ XP
XP
XP
XP
-XP
+DX
tm
tm
tm
@@ -27038,7 +27626,7 @@ fW
fW
hL
hL
-hL
+TJ
xP
Dq
Dq
@@ -27154,13 +27742,13 @@ aa
aa
aa
aa
-XP
-EU
-EU
-rx
-rx
-rx
-rx
+xB
+ZQ
+ZQ
+iM
+iM
+iM
+ZY
uz
RQ
RQ
@@ -27180,7 +27768,7 @@ bP
sZ
hL
Dq
-Dq
+Lk
Dq
Dq
XP
@@ -27302,7 +27890,7 @@ EU
EU
QY
rx
-rx
+sV
CL
Bw
dT
@@ -27322,7 +27910,7 @@ ch
Dq
Dq
Dq
-XP
+up
XP
XP
aa
@@ -27444,7 +28032,7 @@ XP
EU
EU
rx
-rx
+sV
QY
Bw
Wd
@@ -27586,8 +28174,8 @@ aa
XP
EU
EU
-rx
-rx
+wN
+ZY
Bw
Bw
ss
@@ -27729,8 +28317,8 @@ aa
XP
EU
EU
-rx
-rx
+wN
+ZY
qN
Sg
eV
@@ -27872,7 +28460,7 @@ aa
XP
EU
EU
-rx
+sV
Bw
Bw
JH
@@ -29021,7 +29609,7 @@ gU
EX
ST
Uk
-Iz
+bK
Iz
mV
SG
@@ -29163,7 +29751,7 @@ mw
mw
mw
mw
-BF
+AU
yC
Qc
Iz
@@ -29305,7 +29893,7 @@ dd
Hb
pi
mw
-BF
+AU
yC
Pv
Gv
@@ -29447,7 +30035,7 @@ mw
UA
JV
mw
-BF
+AU
Gv
Up
Up
@@ -29589,7 +30177,7 @@ mw
XC
XC
Up
-Up
+Xb
Up
Up
XP
@@ -29731,8 +30319,8 @@ Up
Up
Up
Up
-XP
-XP
+qX
+bA
XP
XP
aa
@@ -29872,10 +30460,10 @@ Dy
Up
XP
XP
+ZJ
+UI
+Kl
XP
-XP
-XP
-aa
aa
aa
aa
@@ -30014,9 +30602,9 @@ ke
Hj
XP
XP
-XP
-aa
-aa
+mo
+Fg
+QI
aa
aa
aa
diff --git a/maps/offmap_vr/talon/talon_v2_areas.dm b/maps/offmap_vr/talon/talon_v2_areas.dm
index eed010ae24..654484f728 100644
--- a/maps/offmap_vr/talon/talon_v2_areas.dm
+++ b/maps/offmap_vr/talon/talon_v2_areas.dm
@@ -80,8 +80,8 @@
/area/talon_v2/anomaly_storage
name = "\improper Talon - Anomaly Storage"
icon_state = "gray"
-/area/talon_v2/unused
- name = "\improper Talon - Unused Room"
+/area/talon_v2/gen_store
+ name = "\improper Talon - General Storage"
icon_state = "gray"
/area/talon_v2/armory
@@ -95,19 +95,19 @@
icon_state = "blue"
/area/talon_v2/crew_quarters/pilot_room
- name = "\improper Talon - Pilot Cabin"
+ name = "\improper Talon - Pilot's Cabin"
icon_state = "gray"
/area/talon_v2/crew_quarters/med_room
- name = "\improper Talon - Doctor Cabin"
+ name = "\improper Talon - Doctor's Cabin"
icon_state = "green"
/area/talon_v2/crew_quarters/eng_room
- name = "\improper Talon - Engineer Cabin"
+ name = "\improper Talon - Engineer's Cabin"
icon_state = "yellow"
/area/talon_v2/crew_quarters/sec_room
- name = "\improper Talon - Guard Cabin"
+ name = "\improper Talon - Guard's Cabin"
icon_state = "red"
/area/talon_v2/crew_quarters/cap_room
- name = "\improper Talon - Captain Cabin"
+ name = "\improper Talon - Captain's Cabin"
icon_state = "blue"
/area/talon_v2/crew_quarters/bar
name = "\improper Talon - Bar"
diff --git a/maps/southern_cross/icons/mob/sc_suit.dmi b/maps/southern_cross/icons/mob/sc_suit.dmi
index 8e899692ff..33c2f27abe 100644
Binary files a/maps/southern_cross/icons/mob/sc_suit.dmi and b/maps/southern_cross/icons/mob/sc_suit.dmi differ
diff --git a/maps/southern_cross/icons/obj/sc_suit.dmi b/maps/southern_cross/icons/obj/sc_suit.dmi
index c38487ccb8..460e9ad699 100644
Binary files a/maps/southern_cross/icons/obj/sc_suit.dmi and b/maps/southern_cross/icons/obj/sc_suit.dmi differ
diff --git a/maps/southern_cross/items/clothing/sc_suit.dm b/maps/southern_cross/items/clothing/sc_suit.dm
index 2b15324f4d..cec3eca91e 100644
--- a/maps/southern_cross/items/clothing/sc_suit.dm
+++ b/maps/southern_cross/items/clothing/sc_suit.dm
@@ -10,20 +10,4 @@
sprite_sheets = list(
SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi'
)
- min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
-
-//Misc
-
-/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
- name = "search and rescue winter coat"
- desc = "A heavy winter jacket. A white star of life is emblazoned on the back, with the words search and rescue written underneath."
- icon_state = "coatsar"
- item_icons = list(slot_wear_suit_str = 'maps/southern_cross/icons/mob/sc_suit.dmi')
- icon = 'maps/southern_cross/icons/obj/sc_suit.dmi'
- armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5)
- valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA)
- allowed = list (/obj/item/weapon/gun,/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
- /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer,/obj/item/stack/medical,
- /obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,
- /obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,
- /obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle)
\ No newline at end of file
+ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
\ No newline at end of file
diff --git a/maps/southern_cross/loadout/loadout_head.dm b/maps/southern_cross/loadout/loadout_head.dm
index cbf7d63c26..bf35942c10 100644
--- a/maps/southern_cross/loadout/loadout_head.dm
+++ b/maps/southern_cross/loadout/loadout_head.dm
@@ -1,4 +1,4 @@
/datum/gear/head/pilot
display_name = "helmet, pilot (Pilot)"
path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit
- allowed_roles = list("Pilot")
+ allowed_roles = list("Pilot")
\ No newline at end of file
diff --git a/maps/southern_cross/loadout/loadout_vr.dm b/maps/southern_cross/loadout/loadout_vr.dm
new file mode 100644
index 0000000000..b11f89eadb
--- /dev/null
+++ b/maps/southern_cross/loadout/loadout_vr.dm
@@ -0,0 +1,9 @@
+/datum/gear/head/pilot/standard
+ display_name = "helmet, standard pilot (Pilot)"
+ path = /obj/item/clothing/head/pilot_vr
+ allowed_roles = list("Pilot")
+
+/datum/gear/head/pilot/colored
+ display_name = "helmet, colored pilot (Pilot)"
+ path = /obj/item/clothing/head/pilot_vr/alt
+ allowed_roles = list("Pilot")
diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm
index 8495119f9d..e64719e2d0 100644
--- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm
+++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm
@@ -1495,6 +1495,12 @@
},
/turf/simulated/floor,
/area/engineering/engine_room)
+"di" = (
+/obj/item/modular_computer/console/preset/engineering{
+ dir = 1
+ },
+/turf/template_noop,
+/area/template_noop)
"dj" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -2573,7 +2579,7 @@ aa
aa
aa
aa
-aa
+di
aa
aa
aa
diff --git a/vorestation.dme b/vorestation.dme
index da2ff047ac..9de517ba47 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4092,9 +4092,9 @@
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
#include "maps\southern_cross\items\clothing\sc_suit.dm"
#include "maps\southern_cross\items\clothing\sc_under.dm"
-#include "maps\southern_cross\loadout\loadout_head.dm"
#include "maps\southern_cross\loadout\loadout_suit.dm"
#include "maps\southern_cross\loadout\loadout_uniform.dm"
+#include "maps\southern_cross\loadout\loadout_vr.dm"
#include "maps\submaps\_helpers.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\engine_submaps\engine.dm"